more cleanup (removing deprecated methods and sections of code that had been commented out)