Cleanup #include order & old comment
Added uncut_error function
Use uncut_error in demo