Fixes #42 #43. Unused namespaces