Removed stuff already in Panopoly Core.