BS-10697, remove userless code