Clean up development code.

No loss of relevant functionality.