Cleanup event listeners and remove function creation from init
Merge pull request #1165 from FredKSchott/cleanup-remove-init-funcitons

Cleanup event listeners and remove function creation from init