Remove fetch logic
Fix output to use new entry format