Remove comment
Remove/Rename more crap