Add endpoint cleaning