removed more DNP parts