class files duplication removed
clean file mess