Update todo and removed unused file