Cleaning up extra whiteboards.

Cleaning up whiteboards that were supplied on the command line but are not
actually in the xml.