JRH: Cleanup XML annotations