LPS-46931 Remove references from DBBuilder