[1603] Cleaning - remove ISelectable