unneccesary code removed