Removed Custom Post Types

Ready for 3.6