removed some unneded things