Clean up some Ngoma-specific default .