more cleanup, rm what appears to be unused files/code