cleanup, still failing to make nav state sing