clean up global namespace calls