Fix error in eventhandling
Remove unused code (menu/forms)