CARE #37: Removed unused calculator query builder