Removing unnecessary files and changing field defaults