FTE-11 clean up the modules