remove name hack... not the right approach