trimming the fat

got rid of unneccesary functions