Some cleanup unused code and missig use-strict
update to use event
some extra comma/semicolon cleanup
Merge pull request #6748 from Carreau/cleanup-nb

Some cleanup unused code and missing use-strict