DOC: remove refactoring old ideas, add to TODO