Cleanup of old unneeded classes