BISERVER-8103: some cleanup