Remove paramterized modules for R16B compatability