Removed the Variable class