Addresses issue #260 (cut out wasted annotation steps) for importing VCFs.  There may also be wasted steps during VCF removal, so leaving the issue open for now.
Cleaned up some dead code and stale comments