Fixed some syntax and remove duplicate UP entries