Clean up and policies with condition