removed superfluous classes (did I spell that right?)