Cleanup of Nombo core modules