removed uneeeded varibles