Remove commented code
Remove some unnecessary DOM manipulations