Debugging build_survey and cleaning everywhere