Cleanup to make MS running