Clean up {key,trust}store-none dependencies