*8274* Remove unnecessary abstraction