===> Cleaning for keystone-0.9.2