Classes Fix, deletion of some lines missused