Better error handling for JSON errors
Removed old items