cleanup changes from PR
Jeromy authored
cf478af9