remove logic from navigation