removed superfluous classes and class output locations