Cleanup of site.pp