Consistency cleanup