unneeded stuff removed