removing commented cruft