Removing needless variables