removed some uncessecary code