Removed unused code and tests and fixed the indentation in a few files.