removing some unneded stuff