Clean up Carvoyant crap errors