Fix module maker options.
Fix module maker options.

Also run clean up at the end.

UCL-RITS/rcps-buildscripts,UCL-RITS/rcps-buildscripts,UCL-RITS/rcps-buildscripts,UCL-RITS/rcps-buildscripts,UCL-RITS/rcps-buildscripts