remove error handling that never worked and fix imports