JMS-1: Cleaned up requires