Removed Values class (minor)