more stuff removed