[BISERVER-8446] Minor cleanup