Remove unneeded function
clean up white space, and remove unused classes