LPS-36654 cleanup