Removed commented out code
Cleaned up error class conversion code

Some of the fallback regex's weren't correct or relevant