[PB] {refactoring} Removed last warnings