Removed unessecary code