cleaned code, removed unneeded classes.