Revert "Changes to routes to fix bug and removed onStart"

This reverts commit 88eb23b5305f042890b7dbaf483c3b24bd9203b9.