Nav cleanup