unneeded stuff removed again