*8235* Remove unnecessary abstraction