Merged conflicts.

lib/scatter.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-unused-vars */
 /* eslint-disable no-console */
-/* globals TweenLite debugCanvas */
+/* globals debugCanvas */
 import Interface from './interface.js'
 import { Points, Polygon, Angle, Elements, LowPassFilter } from './utils.js'
 import Events from './events.js'
@@ -351,15 +351,20 @@ export class AbstractScatter extends Throwable {
     }
 
     close() {
+        this._callCloseCallbacks()
+        this._removeSelfFromScatterContainer()
+    }
+
+    _callCloseCallbacks() {
         if (this.onClose) {
             this.onClose.forEach(callback => callback(this))
+        }
+    }
 
-            /**
-            Removes self from container when it's closed.
-            */
-            if (this.container) {
-                this.container.remove(this)
-            }
+    _removeSelfFromScatterContainer() {
+        // Removes self from container when it's closed.
+        if (this.container) {
+            this.container.remove(this)
         }
     }