Remove suspicious return null