Remove some commented code & some other things