Did some gardening with the various namespaces as they were all over the shop and also the superfluous using statements