deleted more unneded stuff