Remove senseless check here