Big cleanup, should now properly clear overwritten code