Removed some old, unnessecary code