Removing obsolete ControllerLookup

Fix for issue #17