remove unneseccary code