remove a few overlooked genshi droppings