removed a few null refrences