Integration of new DE with catissue plus. This resulted in cleanup of unwanted code that will be re-written or refactored during course of v3.2 release cycle