Clean up of empty diagram annotations etc.