Start of cleanup and fix content-types