remove unneccassary code