[TODO] Remove finished items
2 files changed