further cleanup

more code commented out (suggest deletion)