LPS-52381 - Implement Util.removeEntitySelection method where possible