Remove upper bounds
Move many operations to Util