Cleanup module_builder's public interface