Cruft removal
Yankring now fixed, have to update manually as it is zip