Cleanup unneeded objects even further