Remove unused quota line
Remove pointless None type validation