Fixup namespaces
Remove unused shape