Delete dead code and unused commented code