Cleaned up unbindEntityEvents spec