Cleanup unused code in ContentManager