Cleanup of old development code.