I'd rather not do a wholesale cleanup on things before checking them in, as we want to be able to do a clean diff against the base ODK collect so we can see just our changes