Removed unused folder
Improved: error handling is data-system is down