Clean up and court reports fix