Remove broken highlighting ResT and remove diplicate