Removing some deprecated stuff.