Fix further issues on controller.git

- Further cleanup reference to stale APIs and older bundles not
properly cleaned

Signed-off-by: Giovanni Meo <gmeo@cisco.com>