Fixed clean endpoint