Removed and commented some events