[IMP-dev] Decorator array cleanup