Remove unused code
Reorder error display code
Disable snapshot tests until I fixed Carton