===> Cleaning for opensaml-3.3.1nb3