removed some unneded variables