Removed unnecessary events and old TODOs