Refactoring: removing Jco