deleted unused code & and cleaned some classes