1) added error handlers
2) removed unnecessary modules and files