Yeah the events which are still hanging around in environment.js will be extracted out into an extension to be mixed into the appropriate sub classes.