Cleanup of unnecessary code and tests.