Cleanup
Disable using own errors controller as it doesn't seem to work yet