cleanup6... bah