Clean up problems by removing the module requirement.