Update schema
Revert "Update schema"

This reverts commit 0284796e6f1531d883c08dff68d1f275de373b03.
Don't show all events on admin account pages
Merge master