diff --git a/elements/G.js b/elements/G.js
index d81530ae..01a281c8 100644
--- a/elements/G.js
+++ b/elements/G.js
@@ -3,7 +3,6 @@ import createReactNativeComponentClass from 'react/lib/createReactNativeComponen
 import Shape from './Shape';
 import {transformProps} from '../lib/props';
 import {GroupAttributes} from '../lib/attributes';
-import extractProps from '../lib/extract/extractProps';
 
 class G extends Shape{
     static displayName = 'G';
diff --git a/elements/Svg.js b/elements/Svg.js
index 8fec1cd5..35f11315 100644
--- a/elements/Svg.js
+++ b/elements/Svg.js
@@ -13,7 +13,6 @@ import {
 } from 'react-native';
 import ViewBox from './ViewBox';
 import _ from 'lodash';
-import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass';
 const RNSVGSvgViewManager = NativeModules.RNSVGSvgViewManager;
 
 // Svg - Root node of all Svg elements
@@ -73,8 +72,8 @@ class Svg extends Component{
     };
 
     _onDataURL = (e) => {
-        let callback;
-        while (callback = this.onDataURLCallbacks.shift()) {
+        while (this.onDataURLCallbacks.length) {
+            let callback = this.onDataURLCallbacks.shift();
             callback(e.nativeEvent.base64);
         }
     };
diff --git a/elements/Text.js b/elements/Text.js
index 154a0323..a9179c09 100644
--- a/elements/Text.js
+++ b/elements/Text.js
@@ -1,6 +1,5 @@
 import React, {PropTypes} from 'react';
 import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass';
-import extractProps from '../lib/extract/extractProps';
 import extractText from '../lib/extract/extractText';
 import {numberProp, pathProps} from '../lib/props';
 import {TextAttributes} from '../lib/attributes';