[MODULES-160] Additional cleanup