fixed accidental wrapping of some Errors with Errors
Removed unneeded files.