Module12 clean-up