Cleanup code and use hiera