Remove nonfunctional code and reindent mailbox code.