Removed some things that had been commented out for a while