MSE-11 clean up code