Six cleanup