clean up of sitegen and corresponding updates to site