Cleaner alternative for JBIDE-13599