Cleanup from refactor