Removed unneeded null checks