Move CanDelete method to appropriate class
Latest from core