Drop the TODO for now