get rid of unessecary code