Drop unneeded functions and fix module_name_to_command conversions