rm EventEmitter inheritance, and corrected cb handling