got rid of unneccesary