nav package cleanup part 1.
nav package cleanup part 2.