Deleted some rarely used code. Merged a few files.
Enhancement for issue #19