a bit of cleanup to the jms samples