Removed pointless null checks