lose redundant PI declarations in nav code