removing some algs due to patent concerns, and rearranging

a little bit in order to clean up duplication