xchar rebuild and remove unneeded's