===> Cleaning for xcircuit-3.10.17