Removing unused namespace declarations.
Merge branch 'hotfix/1.0.8'