Removed old code, tests.