Post rethink cleanup