unnecessary null check removed