MDL-29378 Code cleanup in the Survey module