Cleanup from refactoring