Cleaned up unbindEntityEvents spec

could be rewritten :pencil: