Removed some items not needed anymore