removed NULL defs