Removing JMS dependency