Minor style changes
Remove unused method
Replace self.handle_errors with FIXME token

- Temporary solution until I untangle handle error from token emitting