Cleanup, refactor and remove usings from headers.
Add uncommited file.