diff --git a/tool_conf.xml.main b/tool_conf.xml.main
index 49398a4547f..143fe0f8c53 100644
--- a/tool_conf.xml.main
+++ b/tool_conf.xml.main
@@ -77,7 +77,6 @@
diff --git a/tools/extract/genebed_maf_to_fasta_user.xml b/tools/extract/genebed_maf_to_fasta_user.xml
deleted file mode 100644
index 34920e1d884..00000000000
--- a/tools/extract/genebed_maf_to_fasta_user.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
- from a MAF File
- genebed_maf_to_fasta_user.py $dbkey $species $input2 $input1 $out_file1 -
-
-
-
-
-
-
-
-
-
-
-
-
-This tool takes a MAF file and a Gene BED file and creates a FASTA file which contains alignments of user specified species which correspond to the coding exons of the supplied Gene.
-
-
diff --git a/tools/extract/interval_maf_to_merged_fasta_user.xml b/tools/extract/interval_maf_to_merged_fasta_user.xml
deleted file mode 100644
index 372959442b0..00000000000
--- a/tools/extract/interval_maf_to_merged_fasta_user.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
- using used-defined alignments
- interval_maf_to_merged_fasta_user.py $dbkey $species $input2 $input1 $out_file1 $input1_chromCol $input1_startCol $input1_endCol $input1_strandCol -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-.. class:: infomark
-
-What is the differences between these two tools: **Stitch MAF blocks for intervals using locally cached alignments** and **Stitch MAF blocks for intervals from user supplied alignments**?
-
- * **Stitch MAF blocks for intervals using locally cached alignments** uses alignments stored at Galaxy installation at Penn State and is appropriate for most situations. It takes only one dataset as the input - a list of genomic intervals.
- * **Stitch MAF blocks for intervals from user supplied alignments** allows the user to work with his/her own alignemnts instead of those cached at Galaxy site. This tool takes two datasets as inputs - (1) genomic intervals and (2) alignemnts.
-
-In the future these two tools will be merged.
-
-------
-
-**What It Does**
-
-A single genomic region can be covered by multiple alignment blocks. In many cases it is desirable to stitch these alignment blocks together. This tool accepts a list of genomic intervals. For every interval it performs the following:
-
- * finds all MAF blocks that overlap the interval;
- * sorts MAF blocks by alignment score;
- * stitches blocks together and resolves overlaps based on alignment score;
- * outputs alignments in FASTA format.
-
-------
-
-**Example**
-
-Here three MAF blocks overlapping a single interval are stitched together. Space between blocks 2 and 3 is filled with gaps:
-
-.. image:: ../static/images/maf_icons/stitchMaf.png
-
-
-
-
diff --git a/tools/extract/interval_maf_to_merged_fasta_user_code.py b/tools/extract/interval_maf_to_merged_fasta_user_code.py
deleted file mode 100644
index 7c345b36f59..00000000000
--- a/tools/extract/interval_maf_to_merged_fasta_user_code.py
+++ /dev/null
@@ -1,39 +0,0 @@
-import pkg_resources; pkg_resources.require( "bx-python" )
-from bx.align import maf
-# No initialization required.
-
-#return lists of species available, showing gapped and ungapped base counts
-def get_available_species( input_filename ):
- try:
- rval = []
- species={}
- try:
- file_in = open(input_filename, 'r')
- maf_reader = maf.Reader( file_in )
-
- for i, m in enumerate( maf_reader ):
- l = m.components
- for c in l:
- spec,chrom = maf.src_split( c.src )
- if not spec or not chrom:
- spec = chrom = c.src
- if spec not in species:
- species[spec]={"bases":0,"nongaps":0}
- species[spec]["bases"] = species[spec]["bases"] + c.size + c.text.count("-")
- species[spec]["nongaps"] = species[spec]["nongaps"] + c.size
-
- file_in.close()
- except:
- return [("There is a problem with your MAF file",'None',True)]
- species_names = species.keys()
- species_names.sort()
-
- for spec in species_names:
- #species_sequence[spec] = "".join(species_sequence[spec])
-
- display = "%s: %i nongap, %i total bases" % (spec, species[spec]["nongaps"], species[spec]["bases"] )
- rval.append( ( display,spec,True) )
-
- return rval
- except:
- return [("You must wait for the MAF file to be created before you can use this tool.",'None',True)]
diff --git a/tools/extract/user_interval2maf.xml b/tools/extract/user_interval2maf.xml
deleted file mode 100644
index 8b6cef4ce73..00000000000
--- a/tools/extract/user_interval2maf.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
- from user supplied alignments
- user_interval2maf.py --dbkey=$dbkey --chromCol=$input1_chromCol --startCol=$input1_startCol --endCol=$input1_endCol --strandCol=$input1_strandCol --mafFile=$mafFile --interval_file=$input1 --output_file=$out_file1
-
-
-
-
-
-
-
-
-
-
-
-.. class:: infomark
-
-What is the differences between these two tools: **Extract MAF blocks from locally cached alignments** and **Extract MAF blocks from user supplied alignments**?
-
- * **Extract MAF blocks from locally cached alignments** uses alignments stored at Galaxy installation at Penn State and is appropriate for most situations. It takes only one dataset as the input - a list of genomic intervals.
- * **Extract MAF blocks from user supplied alignments** allows the user to work with his/her own alignments instead of those cached at Galaxy site. This tool takes two datasets as inputs - (1) genomic intervals and (2) alignments.
-
------
-
-**What it does**
-
-This tool takes genomic coordinates, superimposes them on multiple alignments (in MAF format) uploaded by the user, and excises alignment blocks corresponding to each set of coordinates. Alignment blocks that extend past START and/or END positions of an interval are trimmed. Note that a single genomic interval may correspond to two or more alignment blocks.
-
------
-
-**Example**
-
-Here a single interval is superimposed on three MAF blocks. Blocks 1 and 3 are trimmed because they extend beyond boundaries of the interval:
-
-.. image:: ../static/images/maf_icons/interval2maf.png
-
-
-
diff --git a/tools/filters/maf/maf_to_fasta_concat.xml b/tools/filters/maf/maf_to_fasta_concat.xml
deleted file mode 100644
index 2470746ecd9..00000000000
--- a/tools/filters/maf/maf_to_fasta_concat.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-
- Converts a MAF formated file to FASTA format
- maf_to_fasta_concat.py $species $input1 $out_file1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-.. class:: infomark
-
-What is the differences between these two tools: **MAF to FASTA** and **MAF to concatenated FASTA** (scroll down for the description of MAF format)?
-
- * **MAF to FASTA** converts a single MAF block to a single FASTA block. For example, if you have 6 MAF blocks, they will be converted to 6 FASTA blocks.
- * **MAF to concatenated FASTA** converts MAF blocks to a single aggregated FASTA block. For example, if you have 6 MAF blocks, they will be converted and concatenated into a single FASTA block.
-
-In the future these two tools will be merged.
-
--------
-
-**What it does**
-
-This tool converts MAF blocks to FASTA format and concatenates them into a single FASTA block.
-
-The interface for this tool contains two pages (steps):
-
- * **Step 1 of 2**. Choose multiple alignments from history to be converted to FASTA format.
- * **Step 2 of 2**. Choose species from the alignment to be included in the output.
-
------
-
-**Example**:
-
-The following alignment::
-
- ##maf version=1
- a score=68686.000000
- s hg18.chr20 56827368 75 + 62435964 GACAGGGTGCATCTGGGAGGG---CCTGCCGGGCCTTTA-TTCAACACTAGATACGCCCCATCTCCAATTCTAATGGAC-
- s panTro2.chr20 56528685 75 + 62293572 GACAGGGTGCATCTGAGAGGG---CCTGCCAGGCCTTTA-TTCAACACTAGATACGCCCCATCTCCAATTCTAATGGAC-
- s rheMac2.chr10 89144112 69 - 94855758 GACAGGGTGCATCTGAGAGGG---CCTGCTGGGCCTTTG-TTCAAAACTAGATATGCCCCAACTCCAATTCTA-------
- s mm8.chr2 173910832 61 + 181976762 AGAAGGATCCACCT------------TGCTGGGCCTCTGCTCCAGCAAGACCCACCTCCCAACTCAAATGCCC-------
- s canFam2.chr24 46551822 67 + 50763139 CG------GCGTCTGTAAGGGGCCACCGCCCGGCCTGTG-CTCAAAGCTACAAATGACTCAACTCCCAACCGA------C
-
- a score=10289.000000
- s hg18.chr20 56827443 37 + 62435964 ATGTGCAGAAAATGTGATACAGAAACCTGCAGAGCAG
- s panTro2.chr20 56528760 37 + 62293572 ATGTGCAGAAAATGTGATACAGAAACCTGCAGAGCAG
- s rheMac2.chr10 89144181 37 - 94855758 ATGTGCGGAAAATGTGATACAGAAACCTGCAGAGCAG
-
-will be converted to (**note** that because mm8 (mouse) and canFam2 (dog) are absent from the second block, they are replaced with gaps after concatenation)::
-
- >canFam2
- CG------GCGTCTGTAAGGGGCCACCGCCCGGCCTGTG-CTCAAAGCTACAAATGACTCAACTCCCAACCGA------C-------------------------------------
- >hg18
- GACAGGGTGCATCTGGGAGGG---CCTGCCGGGCCTTTA-TTCAACACTAGATACGCCCCATCTCCAATTCTAATGGAC-ATGTGCAGAAAATGTGATACAGAAACCTGCAGAGCAG
- >mm8
- AGAAGGATCCACCT------------TGCTGGGCCTCTGCTCCAGCAAGACCCACCTCCCAACTCAAATGCCC--------------------------------------------
- >panTro2
- GACAGGGTGCATCTGAGAGGG---CCTGCCAGGCCTTTA-TTCAACACTAGATACGCCCCATCTCCAATTCTAATGGAC-ATGTGCAGAAAATGTGATACAGAAACCTGCAGAGCAG
- >rheMac2
- GACAGGGTGCATCTGAGAGGG---CCTGCTGGGCCTTTG-TTCAAAACTAGATATGCCCCAACTCCAATTCTA-------ATGTGCGGAAAATGTGATACAGAAACCTGCAGAGCAG
-
-------
-
-.. class:: infomark
-
-**About formats**
-
- **MAF format** multiple alignment format file. This format stores multiple alignments at the DNA level between entire genomes.
-
- - The .maf format is line-oriented. Each multiple alignment ends with a blank line.
- - Each sequence in an alignment is on a single line.
- - Lines starting with # are considered to be comments.
- - Each multiple alignment is in a separate paragraph that begins with an "a" line and contains an "s" line for each sequence in the multiple alignment.
- - Some MAF files may contain two optional line types:
-
- - An "i" line containing information about what is in the aligned species DNA before and after the immediately preceding "s" line;
- - An "e" line containing information about the size of the gap between the alignments that span the current block.
-
-
-
-
diff --git a/tools/filters/maf/maf_to_fasta_multiple_sets.xml b/tools/filters/maf/maf_to_fasta_multiple_sets.xml
deleted file mode 100644
index fe054a04154..00000000000
--- a/tools/filters/maf/maf_to_fasta_multiple_sets.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-
- Converts a MAF formated file to FASTA format
- maf_to_fasta_multiple_sets.py $input1 $out_file1 $species $complete_blocks
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-.. class:: infomark
-
-What is the differences between these two tools: **MAF to FASTA** and **MAF to concatenated FASTA** (scroll down for the description of MAF format)?
-
- * **MAF to FASTA** converts a single MAF block to a single FASTA block. For example, if you have 6 MAF blocks, they will be converted to 6 FASTA blocks.
- * **MAF to concatenated FASTA** converts MAF blocks to a single aggregated FASTA block. For example, if you have 6 MAF blocks, they will be converted and concatenated into a single FASTA block.
-
-In the future these two tools will be merged.
-
--------
-
-**What it does**
-
-This tool converts MAF blocks to FASTA blocks separated by empty lines.
-
-The interface for this tool contains two pages (steps):
-
- * **Step 1 of 2**. Choose multiple alignments from history to be converted to FASTA format.
- * **Step 2 of 2**. Choose species from the alignment to be included in the output and specify how to deal with alignment blocks that lack one or more species:
-
- * **Choose species** - the tool reads the alignment provided during Step 1 and generates a list of species contained within that alignment. Using checkboxes you can specify taxa to be included in the output (all species are selected by default).
- * **Choose to include/exclude blocks with missing species** - if an alignment block does not contain any one of the species you selected within **Choose species** menu and this option is set to **exclude blocks with missing species**, then such a block **will not** be included in the output (see **Example 2** below). For example, if you want to extact human, mouse, and rat from a series of alignments and one of the blocks does not contain mouse sequence, then this block will not be converted to FASTA and will not be returned.
-
-
------
-
-**Example 1**: **Include all species** and **include blocks with missing species**:
-
-The following alignment::
-
- ##maf version=1
- a score=68686.000000
- s hg18.chr20 56827368 75 + 62435964 GACAGGGTGCATCTGGGAGGG---CCTGCCGGGCCTTTA-TTCAACACTAGATACGCCCCATCTCCAATTCTAATGGAC-
- s panTro2.chr20 56528685 75 + 62293572 GACAGGGTGCATCTGAGAGGG---CCTGCCAGGCCTTTA-TTCAACACTAGATACGCCCCATCTCCAATTCTAATGGAC-
- s rheMac2.chr10 89144112 69 - 94855758 GACAGGGTGCATCTGAGAGGG---CCTGCTGGGCCTTTG-TTCAAAACTAGATATGCCCCAACTCCAATTCTA-------
- s mm8.chr2 173910832 61 + 181976762 AGAAGGATCCACCT------------TGCTGGGCCTCTGCTCCAGCAAGACCCACCTCCCAACTCAAATGCCC-------
- s canFam2.chr24 46551822 67 + 50763139 CG------GCGTCTGTAAGGGGCCACCGCCCGGCCTGTG-CTCAAAGCTACAAATGACTCAACTCCCAACCGA------C
-
- a score=10289.000000
- s hg18.chr20 56827443 37 + 62435964 ATGTGCAGAAAATGTGATACAGAAACCTGCAGAGCAG
- s panTro2.chr20 56528760 37 + 62293572 ATGTGCAGAAAATGTGATACAGAAACCTGCAGAGCAG
- s rheMac2.chr10 89144181 37 - 94855758 ATGTGCGGAAAATGTGATACAGAAACCTGCAGAGCAG
-
-will be converted to::
-
- >hg18.chr20(+):56827368-56827443|hg18_0
- GACAGGGTGCATCTGGGAGGG---CCTGCCGGGCCTTTA-TTCAACACTAGATACGCCCCATCTCCAATTCTAATGGAC-
- >panTro2.chr20(+):56528685-56528760|panTro2_0
- GACAGGGTGCATCTGAGAGGG---CCTGCCAGGCCTTTA-TTCAACACTAGATACGCCCCATCTCCAATTCTAATGGAC-
- >rheMac2.chr10(-):89144112-89144181|rheMac2_0
- GACAGGGTGCATCTGAGAGGG---CCTGCTGGGCCTTTG-TTCAAAACTAGATATGCCCCAACTCCAATTCTA-------
- >mm8.chr2(+):173910832-173910893|mm8_0
- AGAAGGATCCACCT------------TGCTGGGCCTCTGCTCCAGCAAGACCCACCTCCCAACTCAAATGCCC-------
- >canFam2.chr24(+):46551822-46551889|canFam2_0
- CG------GCGTCTGTAAGGGGCCACCGCCCGGCCTGTG-CTCAAAGCTACAAATGACTCAACTCCCAACCGA------C
-
- >hg18.chr20(+):56827443-56827480|hg18_1
- ATGTGCAGAAAATGTGATACAGAAACCTGCAGAGCAG
- >panTro2.chr20(+):56528760-56528797|panTro2_1
- ATGTGCAGAAAATGTGATACAGAAACCTGCAGAGCAG
- >rheMac2.chr10(-):89144181-89144218|rheMac2_1
- ATGTGCGGAAAATGTGATACAGAAACCTGCAGAGCAG
-
------
-
-**Example 2**: **Include hg18 and mm8** and **exclude blocks with missing species**:
-
-The following alignment::
-
- ##maf version=1
- a score=68686.000000
- s hg18.chr20 56827368 75 + 62435964 GACAGGGTGCATCTGGGAGGG---CCTGCCGGGCCTTTA-TTCAACACTAGATACGCCCCATCTCCAATTCTAATGGAC-
- s panTro2.chr20 56528685 75 + 62293572 GACAGGGTGCATCTGAGAGGG---CCTGCCAGGCCTTTA-TTCAACACTAGATACGCCCCATCTCCAATTCTAATGGAC-
- s rheMac2.chr10 89144112 69 - 94855758 GACAGGGTGCATCTGAGAGGG---CCTGCTGGGCCTTTG-TTCAAAACTAGATATGCCCCAACTCCAATTCTA-------
- s mm8.chr2 173910832 61 + 181976762 AGAAGGATCCACCT------------TGCTGGGCCTCTGCTCCAGCAAGACCCACCTCCCAACTCAAATGCCC-------
- s canFam2.chr24 46551822 67 + 50763139 CG------GCGTCTGTAAGGGGCCACCGCCCGGCCTGTG-CTCAAAGCTACAAATGACTCAACTCCCAACCGA------C
-
- a score=10289.000000
- s hg18.chr20 56827443 37 + 62435964 ATGTGCAGAAAATGTGATACAGAAACCTGCAGAGCAG
- s panTro2.chr20 56528760 37 + 62293572 ATGTGCAGAAAATGTGATACAGAAACCTGCAGAGCAG
- s rheMac2.chr10 89144181 37 - 94855758 ATGTGCGGAAAATGTGATACAGAAACCTGCAGAGCAG
-
-will be converted to (**note** that the second MAF block, which does not have mm8, is not included in the output)::
-
- >hg18.chr20(+):56827368-56827443|hg18_0
- GACAGGGTGCATCTGGGAGGGCCTGCCGGGCCTTTA-TTCAACACTAGATACGCCCCATCTCCAATTCTAATGGAC
- >mm8.chr2(+):173910832-173910893|mm8_0
- AGAAGGATCCACCT---------TGCTGGGCCTCTGCTCCAGCAAGACCCACCTCCCAACTCAAATGCCC------
-
------
-
-.. class:: infomark
-
-**About formats**
-
-**MAF format** multiple alignment format file. This format stores multiple alignments at the DNA level between entire genomes.
-
- - The .maf format is line-oriented. Each multiple alignment ends with a blank line.
- - Each sequence in an alignment is on a single line.
- - Lines starting with # are considered to be comments.
- - Each multiple alignment is in a separate paragraph that begins with an "a" line and contains an "s" line for each sequence in the multiple alignment.
- - Some MAF files may contain two optional line types:
-
- - An "i" line containing information about what is in the aligned species DNA before and after the immediately preceding "s" line;
- - An "e" line containing information about the size of the gap between the alignments that span the current block.
-
-
-
-