Cleanup of old stuff and mocks.