Removed some things that have moved beyond idea stage.