Cleanup lefterovers from refactoring