Remove some old APE stuff
Cleanup, compatibility