removed unnecessary NOT NULLs