DFS: Removed unfinished features