remove unncessary null check