Removed things that were deprecated