Removed some items that made it in from a bad merge