Added cleanup of published sites
Fixes to publishing