Removed unecasary event