Fix weird 8-space indentation
Fix various formatting issues
Remove non-existent messages

No idea where these came from.