Cleaned up dashboard events