Update header comment
Remove an unused import
Update filepaths