remove extra files
fix error handling for x3. fix test