remove unneeded null check