Remove trailing common
Use new hiera hash configuration