bug fixes in delayed. clean