remove superfluous helper classes