===> Cleaning for orc-0.4.17