Removed stuff already in Panopoly.