Continued cleaning to create separate files for each kernal type.