removing unneccesairy checks