Remove unnecessary class helper