Remove silly null checks