Remove unnecessary helper classes