cleaning
Merge branch 'master' into cleanup
removing unused operator
preserve order of includes
removed unused stuff
Merge branch 'cleanup'