Add upload="false" flag to misc data files
More cleanup