move classification clean up goals