Remove aliases in 6.6 after decision to go with a reindex strategy

[roncohen]

We've decided to go with a reindexing strategy for upgrading to 7.0 and that means we need to clean up the aliases that were added for 6.6 which are no longer needed.

[graphaelli]

mostly reverting #1609

[roncohen]

fixed in #1795