remove bad old code (error handling soon)