===> Cleaning for onyx-5.1.1nb2