NIHVIVO-193 Preliminary code cleanup before making functional modifications.
NIHVIVO-193 Preliminary code cleanup before making functional modifications.

vivo-project/Vitro,vivo-project/Vitro,vivo-project/Vitro,vivo-project/Vitro