Cleanup and fix creation of violations