Removed the un-needed variable holder class.