Removed done ToDos, implement remove_module