VIVO-532: temporary clean up; will explore other options post-1.6