Add remove to make sure we do not leak memory.