removing commented out cruft