Cuckold armature clean up

Related: