clean up and got rid of junk #32