===> Cleaning for restish-0.21.2