Removing dependencies to OpenStack and AWS connectors