Removed imports for functions transferred to GenericModule