cleaned up code

got rid of old/extra commented code that was unused and files that were
unused