Useless cleanup+Cleaner way of suppressing deprecation stuff