Cleanup of nav