remove some unwanted bits and pieces and add in others