added back in remove event listener
Merge branch 'master' of https://github.com/jamesmichiemo/NJ_Squared