cleanups, removed unnecessary files and code