clean up, got rid of some stuff that was commented out