refactor so events are not Loaded by player + remove old gateway code