remove motifs and import stuff to main