add attributes to fix unused_imports
Solve merge conflicts
Merge branch 'jschaf-unused'