clean up
removed some superfluous classes and files