Removed auto-start from locator, router and controller object, developers should start them manually
Removed some TODO