Support controllers out of bundles
Remove an unused import