Clean up after api refactoring