more code cleanups/deletions

not sure if this will ever work as a packaged solution.