Correct XCLEAN implementation