Remove unneeded whitespace
Remove old comments