Removed parameterized modules

Includes breaking API changes.