remove handling of invalid names