Remove almost all events for simplicity
More simplifications...