===> Cleaning for gh-0.11.1