Facia tool: clean up