More messages.
Remove some commented out code.