minor conditional cleanup