dea_next template cleanup