continue cleanup of app nav