Updated docblock, removed unused events