more cleaners

here are two more cleaners to add to the hierachy (one a the top, one at the bottom)