Removed generic error handling which was no longer needed.
Removed unneeded todos