Deleted unnecessary if statements