Cleanup misc files in sites directory
Merge deploy-cleanup into develop