Removed some old code an unnecassery imports