Remove unused namespaces
Update version