Only remove IMF and IM from JNDI if not already done