o: cleanup leftovers