Gets rid of Cite, etc.

 Using jcoyne's suggested method, and adds tests to make sure they don't come back again!