Get rid of parametrized modules
Merge branch 'remove-parametrized-modules' into dev