Code cleanup. Suppressed duplicated classes.