Refactoring: removing OK router and obsolete helpers.