Small accurate cleanup