Consistency cleanup cont