remove unneded stuff