Added removal to avoid memory growth. Now it should be more stable.