Cleanup related to prev. refactoring