diff --git a/cpt_find_spanins/cpt-macros.xml b/cpt_find_spanins/cpt-macros.xml
deleted file mode 100755
index 6c6f39d..0000000
--- a/cpt_find_spanins/cpt-macros.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<macros>
-    <xml name="gff_requirements">
-        <requirements>
-            <requirement type="package" version="2.7">python</requirement>
-            <requirement type="package" version="1.65">biopython</requirement>
-            <requirement type="package" version="2.12.1">requests</requirement>
-            <yield/>
-        </requirements>
-        <version_command>
-		<![CDATA[
-			cd '$__tool_directory__' && git rev-parse HEAD
-		]]>
-		</version_command>
-    </xml>
-    <xml name="citation/mijalisrasche">
-        <citation type="doi">10.1371/journal.pcbi.1008214</citation>
-        <citation type="bibtex">@unpublished{galaxyTools,
-		author = {E. Mijalis, H. Rasche},
-		title = {CPT Galaxy Tools},
-		year = {2013-2017},
-		note = {https://github.com/tamu-cpt/galaxy-tools/}
-		}
-		</citation>
-    </xml>
-    <xml name="citations">
-        <citations>
-            <citation type="doi">10.1371/journal.pcbi.1008214</citation>
-            <citation type="bibtex">
-			@unpublished{galaxyTools,
-				author = {E. Mijalis, H. Rasche},
-				title = {CPT Galaxy Tools},
-				year = {2013-2017},
-				note = {https://github.com/tamu-cpt/galaxy-tools/}
-			}
-			</citation>
-            <yield/>
-        </citations>
-    </xml>
-    <xml name="citations-crr">
-        <citations>
-            <citation type="doi">10.1371/journal.pcbi.1008214</citation>
-            <citation type="bibtex">
-			@unpublished{galaxyTools,
-				author = {C. Ross},
-				title = {CPT Galaxy Tools},
-				year = {2020-},
-				note = {https://github.com/tamu-cpt/galaxy-tools/}
-			}
-			</citation>
-            <yield/>
-        </citations>
-    </xml>
-    <xml name="citations-2020">
-        <citations>
-            <citation type="doi">10.1371/journal.pcbi.1008214</citation>
-            <citation type="bibtex">
-			@unpublished{galaxyTools,
-				author = {E. Mijalis, H. Rasche},
-				title = {CPT Galaxy Tools},
-				year = {2013-2017},
-				note = {https://github.com/tamu-cpt/galaxy-tools/}
-			}
-			</citation>
-            <citation type="bibtex">
-			@unpublished{galaxyTools,
-				author = {A. Criscione},
-				title = {CPT Galaxy Tools},
-				year = {2019-2021},
-				note = {https://github.com/tamu-cpt/galaxy-tools/}
-			}
-                        </citation>
-            <yield/>
-        </citations>
-    </xml>
-    <xml name="citations-2020-AJC-solo">
-        <citations>
-            <citation type="doi">10.1371/journal.pcbi.1008214</citation>
-            <citation type="bibtex">
-			@unpublished{galaxyTools,
-				author = {A. Criscione},
-				title = {CPT Galaxy Tools},
-				year = {2019-2021},
-				note = {https://github.com/tamu-cpt/galaxy-tools/}
-			}
-                        </citation>
-            <yield/>
-        </citations>
-    </xml>
-    <xml name="citations-clm">
-        <citations>
-            <citation type="doi">10.1371/journal.pcbi.1008214</citation>
-            <citation type="bibtex">
-			@unpublished{galaxyTools,
-				author = {C. Maughmer},
-				title = {CPT Galaxy Tools},
-				year = {2017-2020},
-				note = {https://github.com/tamu-cpt/galaxy-tools/}
-			}
-			</citation>
-            <yield/>
-        </citations>
-    </xml>
-    <xml name="sl-citations-clm">
-        <citation type="bibtex">
-			@unpublished{galaxyTools,
-				author = {C. Maughmer},
-				title = {CPT Galaxy Tools},
-				year = {2017-2020},
-				note = {https://github.com/tamu-cpt/galaxy-tools/}
-			}
-			</citation>
-        <yield/>
-    </xml>
-</macros>
diff --git a/cpt_find_spanins/findSpanin.xml b/cpt_find_spanins/findSpanin.xml
index cc10412..683f2f8 100755
--- a/cpt_find_spanins/findSpanin.xml
+++ b/cpt_find_spanins/findSpanin.xml
@@ -2,7 +2,6 @@
     <description>With the outputs from the ISP and OSP candidate tools, cull the list down to candidate pairs</description>
     <macros>
         <import>macros.xml</import>
-    
     </macros>
     <requirements>
         <requirement type="package" version="3.9">python</requirement>
diff --git a/cpt_find_spanins/macros.xml b/cpt_find_spanins/macros.xml
deleted file mode 100755
index 6affa27..0000000
--- a/cpt_find_spanins/macros.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<macros>
-    <xml name="requirements">
-        <requirements>
-            <requirement type="package" version="2019.06.05">regex</requirement>
-            <requirement type="package" version="3.6">python</requirement>
-            <requirement type="package" version="1.77">biopython</requirement>
-            <requirement type="package" version="1.1.7">cpt_gffparser</requirement>
-            <yield/>
-        </requirements>
-    </xml>
-    <token name="@BLAST_TSV@">
-		$blast_tsv
-	</token>
-    <xml name="blast_tsv">
-        <param label="Blast Results" help="TSV/tabular (25 Column)" name="blast_tsv" type="data" format="tabular"/>
-    </xml>
-    <token name="@BLAST_XML@">
-		$blast_xml
-	</token>
-    <xml name="blast_xml">
-        <param label="Blast Results" help="XML format" name="blast_xml" type="data" format="blastxml"/>
-    </xml>
-    <xml name="gff3_with_fasta">
-        <param label="Genome Sequences" name="fasta" type="data" format="fasta"/>
-        <param label="Genome Annotations" name="gff3" type="data" format="gff3"/>
-    </xml>
-    <xml name="genome_selector">
-        <param name="genome_fasta" type="data" format="fasta" label="Source FASTA Sequence"/>
-    </xml>
-    <xml name="gff3_input">
-        <param label="GFF3 Annotations" name="gff3_data" type="data" format="gff3"/>
-    </xml>
-    <xml name="input/gff3+fasta">
-        <expand macro="gff3_input"/>
-        <expand macro="genome_selector"/>
-    </xml>
-    <token name="@INPUT_GFF@">
-	    $gff3_data
-	</token>
-    <token name="@INPUT_FASTA@">
-		genomeref.fa
-	</token>
-    <token name="@GENOME_SELECTOR_PRE@">
-		ln -s $genome_fasta genomeref.fa;
-	</token>
-    <token name="@GENOME_SELECTOR@">
-		genomeref.fa
-	</token>
-    <xml name="input/fasta">
-        <param label="Fasta file" name="sequences" type="data" format="fasta"/>
-    </xml>
-    <token name="@SEQUENCE@">
-		$sequences
-	</token>
-    <xml name="input/fasta/protein">
-        <param label="Protein fasta file" name="sequences" type="data" format="fasta"/>
-    </xml>
-</macros>
diff --git a/cpt_find_spanins/macros.xml b/cpt_find_spanins/macros.xml
new file mode 120000
index 0000000..0c6ff6c
--- /dev/null
+++ b/cpt_find_spanins/macros.xml
@@ -0,0 +1 @@
+../macros.xml
\ No newline at end of file