Clean up Setup workding