KFSCNTRB-1459 cleanup