Removing redundant code.
Removing redundant code.

CelineBoudier/rapid-router,mikebryant/rapid-router,CelineBoudier/rapid-router,mikebryant/rapid-router,CelineBoudier/rapid-router,mikebryant/rapid-router,mikebryant/rapid-router,CelineBoudier/rapid-router