nav package cleanup part 3.