[Infostructure] Code cleanup. Remove duplicates