deleted dead code & comments