remove unused methods, added name normalization test