Some more paramterized module removal