Remove some entities, refactor ArticleStub