Removed dependencies to pb and extra.

Although, I'm not sure that it is correct.