minor cleaning

removed unused Event
some little fixes CS