Clean out global variables that are not really required, a few comments.