HOPKINS: Remove debug hack left in previous commit, some tiny refactoring