Remove dead and commented code