Removed some more trivial upper bounds