Do not call ThreadLocal.remove() as the method was added in JDK5