removed some unused classes.
commented/empty lines cleanup