Cleaned up events and TTT