Some cleanups

Took latest after scott commit. above that
-removed and sorted using
-moved usings inside namespace