Remove non generic modules and support multiple module sections