consistency cleanup