[#797] Remove unnecessary processing

* Changes based on review from @iperdomo and @ichinaski