Cleanup: Slashing and hacking various classes.