I think it's okay to leave it in. It makes sense as this class can get used by vanilla OpenStack deployments and specific OpenStack deployments (e.g. HP or Rackspace).