removing cruft code that has been commented out for a while