removed unneded stuff