WIP: remove events tab and add full check