PT-1158 - Removes helper class