Temp suppress warning
Remove unused
Refactoring
copyright