Code Refactor Done
Removed remoteRouter