*8148* refactor and remove app-specific subclass