Removed useless vars in Variable