Change calls to in synch with the events being fired from YT. Removed dead code