From 4acdd41837762d23fe1a060b01414a41d8789bb6 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 8 Feb 2017 22:14:53 -0600
Subject: [PATCH] Remove lots of static stuff with a fancy regex

---
 src/@ionic-native/plugins/calendar/index.ts   |   2 +-
 .../plugins/call-number/index.ts              |   2 +-
 .../plugins/camera-preview/index.ts           |  18 +--
 src/@ionic-native/plugins/camera/index.ts     |   4 +-
 src/@ionic-native/plugins/card-io/index.ts    |   6 +-
 src/@ionic-native/plugins/clipboard/index.ts  |   4 +-
 src/@ionic-native/plugins/code-push/index.ts  |  12 +-
 src/@ionic-native/plugins/contacts/index.ts   |   6 +-
 src/@ionic-native/plugins/crop/index.ts       |   2 +-
 src/@ionic-native/plugins/datepicker/index.ts |   2 +-
 src/@ionic-native/plugins/dbmeter/index.ts    |   8 +-
 src/@ionic-native/plugins/deeplinks/index.ts  |   4 +-
 .../plugins/device-feedback/index.ts          |   6 +-
 src/@ionic-native/plugins/device/index.ts     |  16 +--
 .../plugins/deviceaccounts/index.ts           |   8 +-
 .../plugins/devicemotion/index.ts             |   4 +-
 .../plugins/deviceorientation/index.ts        |   4 +-
 src/@ionic-native/plugins/diagnostic/index.ts | 116 +++++++++---------
 src/@ionic-native/plugins/dialogs/index.ts    |   8 +-
 .../plugins/emailcomposer/index.ts            |   6 +-
 .../plugins/estimote-beacons/index.ts         |  48 ++++----
 src/@ionic-native/plugins/facebook/index.ts   |  20 +--
 .../plugins/file-chooser/index.ts             |   2 +-
 .../plugins/file-opener/index.ts              |   6 +-
 src/@ionic-native/plugins/file/index.ts       |  66 +++++-----
 src/@ionic-native/plugins/filepath/index.ts   |   2 +-
 .../plugins/fingerprint-aio/index.ts          |   4 +-
 src/@ionic-native/plugins/firebase/index.ts   |  36 +++---
 src/@ionic-native/plugins/flashlight/index.ts |  10 +-
 src/@ionic-native/plugins/geofence/index.ts   |  14 +--
 .../plugins/geolocation/index.ts              |   4 +-
 .../plugins/globalization/index.ts            |  24 ++--
 .../plugins/google-plus/index.ts              |   8 +-
 .../plugins/googleanalytics/index.ts          |  32 ++---
 src/@ionic-native/plugins/googlemap/index.ts  |   4 +-
 .../plugins/headercolor/index.ts              |   2 +-
 src/@ionic-native/plugins/hotspot/index.ts    |  56 ++++-----
 src/@ionic-native/plugins/http/index.ts       |  20 +--
 src/@ionic-native/plugins/httpd/index.ts      |   6 +-
 src/@ionic-native/plugins/ibeacon/index.ts    |  58 ++++-----
 .../plugins/imagepicker/index.ts              |   6 +-
 .../plugins/imageresizer/index.ts             |   2 +-
 .../plugins/inapppurchase/index.ts            |  12 +-
 src/@ionic-native/plugins/insomnia/index.ts   |   4 +-
 src/@ionic-native/plugins/instagram/index.ts  |   6 +-
 src/@ionic-native/plugins/is-debug/index.ts   |   2 +-
 src/@ionic-native/plugins/keyboard/index.ts   |  12 +-
 .../plugins/launch-review/index.ts            |   2 +-
 .../plugins/launchnavigator/index.ts          |  24 ++--
 .../plugins/localnotifications/index.ts       |  42 +++----
 .../plugins/location-accuracy/index.ts        |   6 +-
 src/@ionic-native/plugins/market/index.ts     |   4 +-
 .../plugins/media-capture/index.ts            |  10 +-
 src/@ionic-native/plugins/mixpanel/index.ts   |  28 ++---
 .../plugins/music-controls/index.ts           |  10 +-
 .../plugins/native-audio/index.ts             |  14 +--
 .../plugins/native-geocoder/index.ts          |   4 +-
 .../plugins/native-page-transitions/index.ts  |  10 +-
 .../plugins/nativestorage/index.ts            |   8 +-
 .../plugins/navigationbar/index.ts            |   4 +-
 src/@ionic-native/plugins/network/index.ts    |   8 +-
 src/@ionic-native/plugins/nfc/index.ts        |  40 +++---
 src/@ionic-native/plugins/onesignal/index.ts  |  40 +++---
 src/@ionic-native/plugins/pay-pal/index.ts    |  14 +--
 .../plugins/photo-viewer/index.ts             |   2 +-
 src/@ionic-native/plugins/pin-dialog/index.ts |   2 +-
 src/@ionic-native/plugins/pinterest/index.ts  |  32 ++---
 .../plugins/power-management/index.ts         |   8 +-
 src/@ionic-native/plugins/printer/index.ts    |   4 +-
 src/@ionic-native/plugins/push/index.ts       |   4 +-
 src/@ionic-native/plugins/rollbar/index.ts    |   2 +-
 .../plugins/safari-view-controller/index.ts   |  12 +-
 .../plugins/screen-orientation/index.ts       |   4 +-
 src/@ionic-native/plugins/screenshot/index.ts |   4 +-
 src/@ionic-native/plugins/serial/index.ts     |  14 +--
 src/@ionic-native/plugins/shake/index.ts      |   2 +-
 src/@ionic-native/plugins/sim/index.ts        |   6 +-
 src/@ionic-native/plugins/sms/index.ts        |   4 +-
 .../plugins/socialsharing/index.ts            |  26 ++--
 .../plugins/speech-recognition/index.ts       |  12 +-
 .../plugins/spinnerdialog/index.ts            |   4 +-
 .../plugins/splashscreen/index.ts             |   4 +-
 src/@ionic-native/plugins/sqlite/index.ts     |   6 +-
 src/@ionic-native/plugins/statusbar/index.ts  |  18 +--
 .../plugins/stepcounter/index.ts              |  12 +-
 .../plugins/streaming-media/index.ts          |  10 +-
 src/@ionic-native/plugins/stripe/index.ts     |   4 +-
 .../plugins/text-to-speech/index.ts           |   2 +-
 src/@ionic-native/plugins/toast/index.ts      |  18 +--
 src/@ionic-native/plugins/touchid/index.ts    |   8 +-
 .../plugins/twitter-connect/index.ts          |   6 +-
 .../plugins/video-editor/index.ts             |   8 +-
 .../plugins/video-player/index.ts             |   4 +-
 src/@ionic-native/plugins/webintent/index.ts  |  12 +-
 .../plugins/youtube-video-player/index.ts     |   2 +-
 src/@ionic-native/plugins/z-bar/index.ts      |   2 +-
 src/@ionic-native/plugins/zip/index.ts        |   2 +-
 97 files changed, 616 insertions(+), 616 deletions(-)

diff --git a/src/@ionic-native/plugins/calendar/index.ts b/src/@ionic-native/plugins/calendar/index.ts
index 639eb5b34..2517f608b 100644
--- a/src/@ionic-native/plugins/calendar/index.ts
+++ b/src/@ionic-native/plugins/calendar/index.ts
@@ -242,7 +242,7 @@ export class Calendar {
 
   // deprecated
   // @Cordova()
-  // static createEventInNamedCalendar(
+  // createEventInNamedCalendar(
   //   title?: string,
   //   location?: string,
   //   notes?: string,
diff --git a/src/@ionic-native/plugins/call-number/index.ts b/src/@ionic-native/plugins/call-number/index.ts
index f3b7a5b73..14429921d 100644
--- a/src/@ionic-native/plugins/call-number/index.ts
+++ b/src/@ionic-native/plugins/call-number/index.ts
@@ -34,7 +34,7 @@ export class CallNumber {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static callNumber(numberToCall: string, bypassAppChooser: boolean): Promise<any> {
+  callNumber(numberToCall: string, bypassAppChooser: boolean): Promise<any> {
     return;
   }
 
diff --git a/src/@ionic-native/plugins/camera-preview/index.ts b/src/@ionic-native/plugins/camera-preview/index.ts
index 0e5a7e431..fb28c9dd6 100644
--- a/src/@ionic-native/plugins/camera-preview/index.ts
+++ b/src/@ionic-native/plugins/camera-preview/index.ts
@@ -102,7 +102,7 @@ export class CameraPreview {
   @Cordova({
     sync: true
   })
-  static startCamera(rect: CameraPreviewRect, defaultCamera: string, tapEnabled: boolean, dragEnabled: boolean, toBack: boolean, alpha: number): void { }
+  startCamera(rect: CameraPreviewRect, defaultCamera: string, tapEnabled: boolean, dragEnabled: boolean, toBack: boolean, alpha: number): void { }
 
   /**
    * Stops the camera preview instance.
@@ -110,7 +110,7 @@ export class CameraPreview {
   @Cordova({
     sync: true
   })
-  static stopCamera(): void { }
+  stopCamera(): void { }
 
   /**
    * Take the picture, the parameter size is optional
@@ -119,7 +119,7 @@ export class CameraPreview {
   @Cordova({
     sync: true
   })
-  static takePicture(size?: CameraPreviewSize): void { }
+  takePicture(size?: CameraPreviewSize): void { }
 
   /**
    * Register a callback function that receives the original picture and the image captured from the preview box.
@@ -128,7 +128,7 @@ export class CameraPreview {
   @Cordova({
     observable: true
   })
-  static setOnPictureTakenHandler(): Observable<any> { return; }
+  setOnPictureTakenHandler(): Observable<any> { return; }
 
   /**
    * Switch from the rear camera and front camera, if available.
@@ -136,7 +136,7 @@ export class CameraPreview {
   @Cordova({
     sync: true
   })
-  static switchCamera(): void { }
+  switchCamera(): void { }
 
   /**
    * Show the camera preview box.
@@ -144,7 +144,7 @@ export class CameraPreview {
   @Cordova({
     sync: true
   })
-  static show(): void { }
+  show(): void { }
 
   /**
    * Hide the camera preview box.
@@ -152,7 +152,7 @@ export class CameraPreview {
   @Cordova({
     sync: true
   })
-  static hide(): void { }
+  hide(): void { }
 
   /**
    * Disables the camera preview
@@ -160,7 +160,7 @@ export class CameraPreview {
   @Cordova({
     sync: true
   })
-  static disable(): void { }
+  disable(): void { }
 
   /**
    * Set camera color effect.
@@ -168,6 +168,6 @@ export class CameraPreview {
   @Cordova({
     sync: true
   })
-  static setColorEffect(effect: string): void { }
+  setColorEffect(effect: string): void { }
 
 }
diff --git a/src/@ionic-native/plugins/camera/index.ts b/src/@ionic-native/plugins/camera/index.ts
index 9185b2aff..45787fd38 100644
--- a/src/@ionic-native/plugins/camera/index.ts
+++ b/src/@ionic-native/plugins/camera/index.ts
@@ -200,7 +200,7 @@ export class Camera {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static getPicture(options?: CameraOptions): Promise<any> { return; }
+  getPicture(options?: CameraOptions): Promise<any> { return; }
 
   /**
    * Remove intermediate image files that are kept in temporary storage after calling camera.getPicture.
@@ -210,6 +210,6 @@ export class Camera {
   @Cordova({
     platforms: ['iOS']
   })
-  static cleanup(): Promise<any> { return; };
+  cleanup(): Promise<any> { return; };
 
 }
diff --git a/src/@ionic-native/plugins/card-io/index.ts b/src/@ionic-native/plugins/card-io/index.ts
index 7040985d1..6092ae54c 100644
--- a/src/@ionic-native/plugins/card-io/index.ts
+++ b/src/@ionic-native/plugins/card-io/index.ts
@@ -173,7 +173,7 @@ export class CardIO {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  static canScan(): Promise<boolean> { return; }
+  canScan(): Promise<boolean> { return; }
 
   /**
    * Scan a credit card with card.io.
@@ -181,13 +181,13 @@ export class CardIO {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static scan(options?: CardIOOptions): Promise<CardIOResponse> { return; }
+  scan(options?: CardIOOptions): Promise<CardIOResponse> { return; }
 
   /**
    * Retrieve the version of the card.io library. Useful when contacting support.
    * @returns {Promise<string>}
    */
   @Cordova()
-  static version(): Promise<string> { return; }
+  version(): Promise<string> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/clipboard/index.ts b/src/@ionic-native/plugins/clipboard/index.ts
index 35e814f58..f2e38da2e 100644
--- a/src/@ionic-native/plugins/clipboard/index.ts
+++ b/src/@ionic-native/plugins/clipboard/index.ts
@@ -42,13 +42,13 @@ export class Clipboard {
    * @returns {Promise<any>} Returns a promise after the text has been copied
    */
   @Cordova()
-  static copy(text: string): Promise<any> { return; }
+  copy(text: string): Promise<any> { return; }
 
   /**
    * Pastes the text stored in clipboard
    * @returns {Promise<any>} Returns a promise after the text has been pasted
    */
   @Cordova()
-  static paste(): Promise<any> { return; }
+  paste(): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/code-push/index.ts b/src/@ionic-native/plugins/code-push/index.ts
index 228fa7895..ad208a34b 100644
--- a/src/@ionic-native/plugins/code-push/index.ts
+++ b/src/@ionic-native/plugins/code-push/index.ts
@@ -433,7 +433,7 @@ export class CodePush {
    * @returns {Promise<ILocalPackage>}
    */
   @Cordova()
-  static getCurrentPackage(): Promise<ILocalPackage> {
+  getCurrentPackage(): Promise<ILocalPackage> {
     return;
   }
 
@@ -443,7 +443,7 @@ export class CodePush {
    * @returns {Promise<ILocalPackage>}
    */
   @Cordova()
-  static getPendingPackage(): Promise<ILocalPackage> {
+  getPendingPackage(): Promise<ILocalPackage> {
     return;
   }
 
@@ -460,7 +460,7 @@ export class CodePush {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static checkForUpdate(deploymentKey?: string): Promise<IRemotePackage> {
+  checkForUpdate(deploymentKey?: string): Promise<IRemotePackage> {
     return;
   }
 
@@ -474,7 +474,7 @@ export class CodePush {
    * @returns {Promise<void>}
    */
   @Cordova()
-  static notifyApplicationReady(): Promise<void> {
+  notifyApplicationReady(): Promise<void> {
     return;
   }
 
@@ -484,7 +484,7 @@ export class CodePush {
    * @returns {Promise<void>}
    */
   @Cordova()
-  static restartApplication(): Promise<void> {
+  restartApplication(): Promise<void> {
     return;
   }
 
@@ -514,7 +514,7 @@ export class CodePush {
     successIndex: 0,
     errorIndex: 3 // we don't need this, so we set it to a value higher than # of args
   })
-  static sync(syncOptions?: SyncOptions, downloadProgress?: SuccessCallback<DownloadProgress>): Observable<SyncStatus> {
+  sync(syncOptions?: SyncOptions, downloadProgress?: SuccessCallback<DownloadProgress>): Observable<SyncStatus> {
     return;
   }
 
diff --git a/src/@ionic-native/plugins/contacts/index.ts b/src/@ionic-native/plugins/contacts/index.ts
index c9e6ef89d..d5fc092d0 100644
--- a/src/@ionic-native/plugins/contacts/index.ts
+++ b/src/@ionic-native/plugins/contacts/index.ts
@@ -301,7 +301,7 @@ export class Contacts {
    * Create a single contact.
    * @returns {Contact} Returns a Contact object
    */
-  static create(): Contact {
+  create(): Contact {
     return new Contact();
   }
 
@@ -311,7 +311,7 @@ export class Contacts {
    * @param options {IContactFindOptions} Optional options for the query
    * @returns {Promise<Contact[]>} Returns a Promise that resolves with the search results (an array of Contact objects)
    */
-  static find(fields: ContactFieldType[], options?: IContactFindOptions): Promise<Contact[]> {
+  find(fields: ContactFieldType[], options?: IContactFindOptions): Promise<Contact[]> {
     return getPromise((resolve, reject) => {
       navigator.contacts.find(fields, (contacts) => {
         resolve(contacts.map(processContact));
@@ -323,7 +323,7 @@ export class Contacts {
    * Select a single Contact.
    * @returns {Promise<Contact>} Returns a Promise that resolves with the selected Contact
    */
-  static pickContact(): Promise<Contact> {
+  pickContact(): Promise<Contact> {
     return getPromise((resolve, reject) => {
       navigator.contacts.pickContact((contact) => resolve(processContact(contact)), reject);
     });
diff --git a/src/@ionic-native/plugins/crop/index.ts b/src/@ionic-native/plugins/crop/index.ts
index 2e21683f0..4046356fb 100644
--- a/src/@ionic-native/plugins/crop/index.ts
+++ b/src/@ionic-native/plugins/crop/index.ts
@@ -35,6 +35,6 @@ export class Crop {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static crop(pathToImage: string, options?: {quality: number}): Promise<string> { return; }
+  crop(pathToImage: string, options?: {quality: number}): Promise<string> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/datepicker/index.ts b/src/@ionic-native/plugins/datepicker/index.ts
index 8c4825fb7..d934ddb81 100644
--- a/src/@ionic-native/plugins/datepicker/index.ts
+++ b/src/@ionic-native/plugins/datepicker/index.ts
@@ -167,7 +167,7 @@ export class DatePicker {
    * @returns {Promise<Date>} Returns a promise that resolves with the picked date and/or time, or rejects with an error.
    */
   @Cordova()
-  static show(options: DatePickerOptions): Promise<Date> {
+  show(options: DatePickerOptions): Promise<Date> {
     return;
   }
 
diff --git a/src/@ionic-native/plugins/dbmeter/index.ts b/src/@ionic-native/plugins/dbmeter/index.ts
index be4b5f037..69c175ad6 100644
--- a/src/@ionic-native/plugins/dbmeter/index.ts
+++ b/src/@ionic-native/plugins/dbmeter/index.ts
@@ -48,27 +48,27 @@ export class DBMeter {
     observable: true,
     clearFunction: 'stop'
   })
-  static start(): Observable<any> { return; }
+  start(): Observable<any> { return; }
 
   /**
    * Stops listening
    * @private
    */
   @Cordova()
-  static stop(): Promise<any> { return; }
+  stop(): Promise<any> { return; }
 
   /**
    * Check if the DB Meter is listening
    * @returns {Promise<boolean>} Returns a promise that resolves with a boolean that tells us whether the DB meter is listening
    */
   @Cordova()
-  static isListening(): Promise<boolean> { return; }
+  isListening(): Promise<boolean> { return; }
 
   /**
    * Delete the DB Meter instance
    * @returns {Promise<any>} Returns a promise that will resolve if the instance has been deleted, and rejects if errors occur.
    */
   @Cordova()
-  static delete(): Promise<any> { return; }
+  delete(): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/deeplinks/index.ts b/src/@ionic-native/plugins/deeplinks/index.ts
index de4f20c6c..bceb5da6a 100644
--- a/src/@ionic-native/plugins/deeplinks/index.ts
+++ b/src/@ionic-native/plugins/deeplinks/index.ts
@@ -95,7 +95,7 @@ export class Deeplinks {
   @Cordova({
     observable: true
   })
-  static route(paths): Observable<DeeplinkMatch> { return; }
+  route(paths): Observable<DeeplinkMatch> { return; }
 
   /**
    *
@@ -118,6 +118,6 @@ export class Deeplinks {
   @Cordova({
     observable: true
   })
-  static routeWithNavController(navController, paths): Observable<DeeplinkMatch> { return; }
+  routeWithNavController(navController, paths): Observable<DeeplinkMatch> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/device-feedback/index.ts b/src/@ionic-native/plugins/device-feedback/index.ts
index 7a6d9d3e7..1693b4fa1 100644
--- a/src/@ionic-native/plugins/device-feedback/index.ts
+++ b/src/@ionic-native/plugins/device-feedback/index.ts
@@ -39,20 +39,20 @@ export class DeviceFeedback {
    * Provide sound feedback to user, nevertheless respect user's settings and current active device profile as native feedback do.
    */
   @Cordova({ sync: true })
-  static acoustic(): void { }
+  acoustic(): void { }
 
   /**
    * Provide vibrate feedback to user, nevertheless respect user's tactile feedback setting as native feedback do.
    * @param type {Number} Specify type of vibration feedback. 0 for long press, 1 for virtual key, or 3 for keyboard tap.
    */
   @Cordova({ sync: true })
-  static haptic(type: number): void { }
+  haptic(type: number): void { }
 
   /**
    * Check if haptic and acoustic feedback is enabled by user settings.
    * @returns {Promise<any>}
    */
   @Cordova()
-  static isFeedbackEnabled(): Promise<{ haptic: boolean; acoustic: boolean; }> { return; }
+  isFeedbackEnabled(): Promise<{ haptic: boolean; acoustic: boolean; }> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/device/index.ts b/src/@ionic-native/plugins/device/index.ts
index 23d98d730..bca820060 100644
--- a/src/@ionic-native/plugins/device/index.ts
+++ b/src/@ionic-native/plugins/device/index.ts
@@ -27,37 +27,37 @@ export class Device {
 
   /** Get the version of Cordova running on the device. */
   @CordovaProperty
-  static cordova: string;
+  cordova: string;
 
   /**
    * The device.model returns the name of the device's model or product. The value is set
    * by the device manufacturer and may be different across versions of the same product.
    */
   @CordovaProperty
-  static model: string;
+  model: string;
 
   /** Get the device's operating system name. */
   @CordovaProperty
-  static platform: string;
+  platform: string;
 
   /** Get the device's Universally Unique Identifier (UUID). */
   @CordovaProperty
-  static uuid: string;
+  uuid: string;
 
   /** Get the operating system version. */
   @CordovaProperty
-  static version: string;
+  version: string;
 
   /** Get the device's manufacturer. */
   @CordovaProperty
-  static manufacturer: string;
+  manufacturer: string;
 
   /** Whether the device is running on a simulator. */
   @CordovaProperty
-  static isVirtual: boolean;
+  isVirtual: boolean;
 
   /** Get the device hardware serial number. */
   @CordovaProperty
-  static serial: string;
+  serial: string;
 
 }
diff --git a/src/@ionic-native/plugins/deviceaccounts/index.ts b/src/@ionic-native/plugins/deviceaccounts/index.ts
index 2a0530bfa..738606e71 100644
--- a/src/@ionic-native/plugins/deviceaccounts/index.ts
+++ b/src/@ionic-native/plugins/deviceaccounts/index.ts
@@ -16,27 +16,27 @@ export class DeviceAccounts {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static get(): Promise<any> { return; }
+  get(): Promise<any> { return; }
 
   /**
    *  Get all accounts registered on Android device for requested type
    * @returns {Promise<any>}
    */
   @Cordova()
-  static getByType(type: string): Promise<any> { return; }
+  getByType(type: string): Promise<any> { return; }
 
   /**
    *  Get all emails registered on Android device (accounts with 'com.google' type)
    * @returns {Promise<any>}
    */
   @Cordova()
-  static getEmails(): Promise<any> { return; }
+  getEmails(): Promise<any> { return; }
 
   /**
    *  Get the first email registered on Android device
    * @returns {Promise<any>}
    */
   @Cordova()
-  static getEmail(): Promise<any> { return; }
+  getEmail(): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/devicemotion/index.ts b/src/@ionic-native/plugins/devicemotion/index.ts
index 53b3ea7a2..82f6afcde 100644
--- a/src/@ionic-native/plugins/devicemotion/index.ts
+++ b/src/@ionic-native/plugins/devicemotion/index.ts
@@ -78,7 +78,7 @@ export class DeviceMotion {
    * @returns {Promise<DeviceMotionAccelerationData>} Returns object with x, y, z, and timestamp properties
    */
   @Cordova()
-  static getCurrentAcceleration(): Promise<DeviceMotionAccelerationData> { return; }
+  getCurrentAcceleration(): Promise<DeviceMotionAccelerationData> { return; }
 
   /**
    * Watch the device acceleration. Clear the watch by unsubscribing from the observable.
@@ -90,6 +90,6 @@ export class DeviceMotion {
     observable: true,
     clearFunction: 'clearWatch'
   })
-  static watchAcceleration(options?: DeviceMotionAccelerometerOptions): Observable<DeviceMotionAccelerationData> { return; }
+  watchAcceleration(options?: DeviceMotionAccelerometerOptions): Observable<DeviceMotionAccelerationData> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/deviceorientation/index.ts b/src/@ionic-native/plugins/deviceorientation/index.ts
index cf684383c..dfb9ad0a5 100644
--- a/src/@ionic-native/plugins/deviceorientation/index.ts
+++ b/src/@ionic-native/plugins/deviceorientation/index.ts
@@ -83,7 +83,7 @@ export class DeviceOrientation {
    * @returns {Promise<DeviceOrientationCompassHeading>}
    */
   @Cordova()
-  static getCurrentHeading(): Promise<DeviceOrientationCompassHeading> { return; }
+  getCurrentHeading(): Promise<DeviceOrientationCompassHeading> { return; }
 
   /**
    * Get the device current heading at a regular interval
@@ -97,6 +97,6 @@ export class DeviceOrientation {
     observable: true,
     clearFunction: 'clearWatch'
   })
-  static watchHeading(options?: DeviceOrientationCompassOptions): Observable<DeviceOrientationCompassHeading> { return; }
+  watchHeading(options?: DeviceOrientationCompassOptions): Observable<DeviceOrientationCompassHeading> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/diagnostic/index.ts b/src/@ionic-native/plugins/diagnostic/index.ts
index 6651a4b3e..b5bbbfa9c 100644
--- a/src/@ionic-native/plugins/diagnostic/index.ts
+++ b/src/@ionic-native/plugins/diagnostic/index.ts
@@ -117,7 +117,7 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static isLocationAvailable(): Promise<any> { return; }
+  isLocationAvailable(): Promise<any> { return; }
 
   /**
    * Checks if Wifi is connected/enabled. On iOS this returns true if the device is connected to a network by WiFi. On Android and Windows 10 Mobile this returns true if the WiFi setting is set to enabled.
@@ -125,7 +125,7 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static isWifiAvailable(): Promise<any> { return; }
+  isWifiAvailable(): Promise<any> { return; }
 
   /**
    * Checks if the device has a camera. On Android this returns true if the device has a camera. On iOS this returns true if both the device has a camera AND the application is authorized to use it. On Windows 10 Mobile this returns true if both the device has a rear-facing camera AND the
@@ -133,7 +133,7 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static isCameraAvailable(): Promise<any> { return; }
+  isCameraAvailable(): Promise<any> { return; }
 
   /**
    * Checks if the device has Bluetooth capabilities and if so that Bluetooth is switched on (same on Android, iOS and Windows 10 Mobile)
@@ -141,38 +141,38 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static isBluetoothAvailable(): Promise<any> { return; }
+  isBluetoothAvailable(): Promise<any> { return; }
 
   /**
    * Displays the device location settings to allow user to enable location services/change location mode.
    */
   @Cordova({ sync: true, platforms: ['Android', 'Windows 10'] })
-  static switchToLocationSettings(): void { }
+  switchToLocationSettings(): void { }
 
   /**
    * Displays mobile settings to allow user to enable mobile data.
    */
   @Cordova({ sync: true, platforms: ['Android', 'Windows 10'] })
-  static switchToMobileDataSettings(): void { }
+  switchToMobileDataSettings(): void { }
 
   /**
    * Displays Bluetooth settings to allow user to enable Bluetooth.
    */
   @Cordova({ sync: true, platforms: ['Android', 'Windows 10'] })
-  static switchToBluetoothSettings(): void { }
+  switchToBluetoothSettings(): void { }
 
   /**
    * Displays WiFi settings to allow user to enable WiFi.
    */
   @Cordova({ sync: true, platforms: ['Android', 'Windows 10'] })
-  static switchToWifiSettings(): void { }
+  switchToWifiSettings(): void { }
 
   /**
    * Returns true if the WiFi setting is set to enabled, and is the same as `isWifiAvailable()`
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'Windows 10'] })
-  static isWifiEnabled(): Promise<boolean> { return; }
+  isWifiEnabled(): Promise<boolean> { return; }
 
   /**
    * Enables/disables WiFi on the device.
@@ -181,7 +181,7 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ callbackOrder: 'reverse', platforms: ['Android', 'Windows 10'] })
-  static setWifiState(state: boolean): Promise<any> { return; }
+  setWifiState(state: boolean): Promise<any> { return; }
 
   /**
    * Enables/disables Bluetooth on the device.
@@ -190,14 +190,14 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ callbackOrder: 'reverse', platforms: ['Android', 'Windows 10'] })
-  static setBluetoothState(state: boolean): Promise<any> { return; }
+  setBluetoothState(state: boolean): Promise<any> { return; }
 
   /**
    * Returns true if the device setting for location is on. On Android this returns true if Location Mode is switched on. On iOS this returns true if Location Services is switched on.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  static isLocationEnabled(): Promise<boolean> { return; }
+  isLocationEnabled(): Promise<boolean> { return; }
 
   /**
    * Checks if the application is authorized to use location.
@@ -205,14 +205,14 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static isLocationAuthorized(): Promise<any> { return; }
+  isLocationAuthorized(): Promise<any> { return; }
 
   /**
    * Returns the location authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  static getLocationAuthorizationStatus(): Promise<any> { return; }
+  getLocationAuthorizationStatus(): Promise<any> { return; }
 
   /**
    * Returns the location authorization status for the application.
@@ -222,14 +222,14 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })
-  static requestLocationAuthorization(mode?: string): Promise<any> { return; }
+  requestLocationAuthorization(mode?: string): Promise<any> { return; }
 
   /**
    * Checks if camera hardware is present on device.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  static isCameraPresent(): Promise<any> { return; }
+  isCameraPresent(): Promise<any> { return; }
 
   /**
    * Checks if the application is authorized to use the camera.
@@ -237,63 +237,63 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  static isCameraAuthorized(): Promise<any> { return; }
+  isCameraAuthorized(): Promise<any> { return; }
 
   /**
    * Returns the camera authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  static getCameraAuthorizationStatus(): Promise<any> { return; }
+  getCameraAuthorizationStatus(): Promise<any> { return; }
 
   /**
    * Requests camera authorization for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  static requestCameraAuthorization(): Promise<any> { return; }
+  requestCameraAuthorization(): Promise<any> { return; }
 
   /**
    * Checks if the application is authorized to use the microphone.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  static isMicrophoneAuthorized(): Promise<boolean> { return; }
+  isMicrophoneAuthorized(): Promise<boolean> { return; }
 
   /**
    * Returns the microphone authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  static getMicrophoneAuthorizationStatus(): Promise<any> { return; }
+  getMicrophoneAuthorizationStatus(): Promise<any> { return; }
 
   /**
    * Requests microphone authorization for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  static requestMicrophoneAuthorization(): Promise<any> { return; }
+  requestMicrophoneAuthorization(): Promise<any> { return; }
 
   /**
    * Checks if the application is authorized to use contacts (address book).
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  static isContactsAuthorized(): Promise<boolean> { return; }
+  isContactsAuthorized(): Promise<boolean> { return; }
 
   /**
    * Returns the contacts authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  static getContactsAuthorizationStatus(): Promise<any> { return; }
+  getContactsAuthorizationStatus(): Promise<any> { return; }
 
   /**
    * Requests contacts authorization for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  static requestContactsAuthorization(): Promise<any> { return; }
+  requestContactsAuthorization(): Promise<any> { return; }
 
   /**
    * Checks if the application is authorized to use the calendar.
@@ -306,7 +306,7 @@ export class Diagnostic {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  static isCalendarAuthorized(): Promise<boolean> { return; }
+  isCalendarAuthorized(): Promise<boolean> { return; }
 
   /**
    * Returns the calendar authorization status for the application.
@@ -320,7 +320,7 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  static getCalendarAuthorizationStatus(): Promise<any> { return; }
+  getCalendarAuthorizationStatus(): Promise<any> { return; }
 
   /**
    * Requests calendar authorization for the application.
@@ -337,7 +337,7 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  static requestCalendarAuthorization(): Promise<any> { return; }
+  requestCalendarAuthorization(): Promise<any> { return; }
 
   /**
    * Opens settings page for this app.
@@ -346,28 +346,28 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  static switchToSettings(): Promise<any> { return; }
+  switchToSettings(): Promise<any> { return; }
 
   /**
    * Returns the state of Bluetooth on the device.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  static getBluetoothState(): Promise<any> { return; }
+  getBluetoothState(): Promise<any> { return; }
 
   /**
    * Registers a function to be called when a change in Bluetooth state occurs.
    * @param handler
    */
   @Cordova({ platforms: ['Android', 'iOS'], sync: true })
-  static registerBluetoothStateChangeHandler(handler: Function): void { }
+  registerBluetoothStateChangeHandler(handler: Function): void { }
 
   /**
    * Registers a function to be called when a change in Location state occurs.
    * @param handler
    */
   @Cordova({ platforms: ['Android', 'iOS'], sync: true })
-  static registerLocationStateChangeHandler(handler: Function): void { }
+  registerLocationStateChangeHandler(handler: Function): void { }
 
   /**
    * Checks if high-accuracy locations are available to the app from GPS hardware.
@@ -375,7 +375,7 @@ export class Diagnostic {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  static isGpsLocationAvailable(): Promise<boolean> { return; }
+  isGpsLocationAvailable(): Promise<boolean> { return; }
 
   /**
    * Checks if location mode is set to return high-accuracy locations from GPS hardware.
@@ -385,7 +385,7 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  static isGpsLocationEnabled(): Promise<any> { return; }
+  isGpsLocationEnabled(): Promise<any> { return; }
 
   /**
    * Checks if low-accuracy locations are available to the app from network triangulation/WiFi access points.
@@ -393,7 +393,7 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  static isNetworkLocationAvailable(): Promise<any> { return; }
+  isNetworkLocationAvailable(): Promise<any> { return; }
 
   /**
    * Checks if location mode is set to return low-accuracy locations from network triangulation/WiFi access points.
@@ -403,14 +403,14 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  static isNetworkLocationEnabled(): Promise<any> { return; }
+  isNetworkLocationEnabled(): Promise<any> { return; }
 
   /**
    * Returns the current location mode setting for the device.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  static getLocationMode(): Promise<any> { return; }
+  getLocationMode(): Promise<any> { return; }
 
   /**
    * Returns the current authorisation status for a given permission.
@@ -419,7 +419,7 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'], callbackOrder: 'reverse' })
-  static getPermissionAuthorizationStatus(permission: any): Promise<any> { return; }
+  getPermissionAuthorizationStatus(permission: any): Promise<any> { return; }
 
   /**
    * Returns the current authorisation status for multiple permissions.
@@ -428,7 +428,7 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'], callbackOrder: 'reverse' })
-  static getPermissionsAuthorizationStatus(permissions: any[]): Promise<any> { return; }
+  getPermissionsAuthorizationStatus(permissions: any[]): Promise<any> { return; }
 
   /**
    * Requests app to be granted authorisation for a runtime permission.
@@ -437,7 +437,7 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'], callbackOrder: 'reverse' })
-  static requestRuntimePermission(permission: any): Promise<any> { return; }
+  requestRuntimePermission(permission: any): Promise<any> { return; }
 
   /**
    * Requests app to be granted authorisation for multiple runtime permissions.
@@ -446,7 +446,7 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'], callbackOrder: 'reverse' })
-  static requestRuntimePermissions(permissions: any[]): Promise<any> { return; }
+  requestRuntimePermissions(permissions: any[]): Promise<any> { return; }
 
   /**
    * Indicates if the plugin is currently requesting a runtime permission via the native API.
@@ -456,7 +456,7 @@ export class Diagnostic {
    * @returns {boolean}
    */
   @Cordova({ sync: true })
-  static isRequestingPermission(): boolean { return; }
+  isRequestingPermission(): boolean { return; }
 
   /**
    * Registers a function to be called when a runtime permission request has completed.
@@ -464,7 +464,7 @@ export class Diagnostic {
    * @param handler {Function}
    */
   @Cordova({ sync: true })
-  static registerPermissionRequestCompleteHandler(handler: Function): void { return; }
+  registerPermissionRequestCompleteHandler(handler: Function): void { return; }
 
   /**
    * Checks if the device setting for Bluetooth is switched on.
@@ -472,42 +472,42 @@ export class Diagnostic {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  static isBluetoothEnabled(): Promise<boolean> { return; }
+  isBluetoothEnabled(): Promise<boolean> { return; }
 
   /**
    * Checks if the device has Bluetooth capabilities.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  static hasBluetoothSupport(): Promise<boolean> { return; }
+  hasBluetoothSupport(): Promise<boolean> { return; }
 
   /**
    * Checks if the device has Bluetooth Low Energy (LE) capabilities.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  static hasBluetoothLESupport(): Promise<boolean> { return; }
+  hasBluetoothLESupport(): Promise<boolean> { return; }
 
   /**
    * Checks if the device supports Bluetooth Low Energy (LE) Peripheral mode.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  static hasBluetoothLEPeripheralSupport(): Promise<boolean> { return; }
+  hasBluetoothLEPeripheralSupport(): Promise<boolean> { return; }
 
   /**
    * Checks if the application is authorized to use the Camera Roll in Photos app.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  static isCameraRollAuthorized(): Promise<boolean> { return; }
+  isCameraRollAuthorized(): Promise<boolean> { return; }
 
   /**
    * Returns the authorization status for the application to use the Camera Roll in Photos app.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  static getCameraRollAuthorizationStatus(): Promise<boolean> { return; }
+  getCameraRollAuthorizationStatus(): Promise<boolean> { return; }
 
   /**
    * Requests camera roll authorization for the application.
@@ -516,21 +516,21 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  static requestCameraRollAuthorization(): Promise<any> { return; }
+  requestCameraRollAuthorization(): Promise<any> { return; }
 
   /**
    * Checks if remote (push) notifications are enabled.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  static isRemoteNotificationsEnabled(): Promise<boolean> { return; }
+  isRemoteNotificationsEnabled(): Promise<boolean> { return; }
 
   /**
    * Indicates if the app is registered for remote (push) notifications on the device.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  static isRegisteredForRemoteNotifications(): Promise<boolean> { return; }
+  isRegisteredForRemoteNotifications(): Promise<boolean> { return; }
 
   /**
    * Indicates the current setting of notification types for the app in the Settings app.
@@ -538,41 +538,41 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  static getRemoteNotificationTypes(): Promise<any> { return; }
+  getRemoteNotificationTypes(): Promise<any> { return; }
 
   /**
    * Checks if the application is authorized to use reminders.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  static isRemindersAuthorized(): Promise<boolean> { return; }
+  isRemindersAuthorized(): Promise<boolean> { return; }
 
   /**
    * Returns the reminders authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  static getRemindersAuthorizationStatus(): Promise<any> { return; }
+  getRemindersAuthorizationStatus(): Promise<any> { return; }
 
   /**
    * Requests reminders authorization for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  static requestRemindersAuthorization(): Promise<any> { return; }
+  requestRemindersAuthorization(): Promise<any> { return; }
 
   /**
    * Checks if the application is authorized for background refresh.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  static isBackgroundRefreshAuthorized(): Promise<boolean> { return; }
+  isBackgroundRefreshAuthorized(): Promise<boolean> { return; }
 
   /**
    * Returns the background refresh authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  static getBackgroundRefreshStatus(): Promise<any> { return; }
+  getBackgroundRefreshStatus(): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/dialogs/index.ts b/src/@ionic-native/plugins/dialogs/index.ts
index 9af76abbe..5f842ddef 100644
--- a/src/@ionic-native/plugins/dialogs/index.ts
+++ b/src/@ionic-native/plugins/dialogs/index.ts
@@ -55,7 +55,7 @@ export class Dialogs {
     successIndex: 1,
     errorIndex: 4
   })
-  static alert(
+  alert(
     message,
     title: string = 'Alert',
     buttonName: string = 'OK'
@@ -72,7 +72,7 @@ export class Dialogs {
     successIndex: 1,
     errorIndex: 4
   })
-  static confirm(
+  confirm(
     message,
     title: string = 'Confirm',
     buttonLabels: Array<string> = ['OK', 'Cancel']
@@ -90,7 +90,7 @@ export class Dialogs {
     successIndex: 1,
     errorIndex: 5
   })
-  static prompt(
+  prompt(
     message?: string,
     title: string = 'Prompt',
     buttonLabels: Array<string> = ['OK', 'Cancel'],
@@ -105,6 +105,6 @@ export class Dialogs {
   @Cordova({
     sync: true
   })
-  static beep(times: number): void { }
+  beep(times: number): void { }
 
 }
diff --git a/src/@ionic-native/plugins/emailcomposer/index.ts b/src/@ionic-native/plugins/emailcomposer/index.ts
index 6284d75dd..d40ee4114 100644
--- a/src/@ionic-native/plugins/emailcomposer/index.ts
+++ b/src/@ionic-native/plugins/emailcomposer/index.ts
@@ -83,7 +83,7 @@ export class EmailComposer {
    * @param app {string?} An optional app id or uri scheme.
    * @returns {Promise<any>} Resolves if available, rejects if not available
    */
-  static isAvailable(app?: string): Promise<any> {
+  isAvailable(app?: string): Promise<any> {
     return new Promise<boolean>((resolve, reject) => {
       if (app) {
         cordova.plugins.email.isAvailable(app, (isAvailable) => {
@@ -112,7 +112,7 @@ export class EmailComposer {
    * @param packageName {string} The package name
    */
   @Cordova()
-  static addAlias(alias: string, packageName: string): void { }
+  addAlias(alias: string, packageName: string): void { }
 
   /**
    * Displays the email composer pre-filled with data.
@@ -125,6 +125,6 @@ export class EmailComposer {
     successIndex: 1,
     errorIndex: 3
   })
-  static open(options: EmailComposerOptions, scope?: any): Promise<any> { return; }
+  open(options: EmailComposerOptions, scope?: any): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/estimote-beacons/index.ts b/src/@ionic-native/plugins/estimote-beacons/index.ts
index 2574c5706..88a19f821 100644
--- a/src/@ionic-native/plugins/estimote-beacons/index.ts
+++ b/src/@ionic-native/plugins/estimote-beacons/index.ts
@@ -110,7 +110,7 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static requestWhenInUseAuthorization(): Promise<any> { return; }
+  requestWhenInUseAuthorization(): Promise<any> { return; }
 
   /**
    * Ask the user for permission to use location services
@@ -131,7 +131,7 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static requestAlwaysAuthorization(): Promise<any> { return; }
+  requestAlwaysAuthorization(): Promise<any> { return; }
 
   /**
    * Get the current location authorization status.
@@ -150,7 +150,7 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static authorizationStatus(): Promise<any> { return; }
+  authorizationStatus(): Promise<any> { return; }
 
   /**
    * Start advertising as a beacon.
@@ -172,7 +172,7 @@ export class EstimoteBeacons {
   @Cordova({
     clearFunction: 'stopAdvertisingAsBeacon'
   })
-  static startAdvertisingAsBeacon(uuid: string, major: number, minor: number, regionId: string): Promise<any> { return; }
+  startAdvertisingAsBeacon(uuid: string, major: number, minor: number, regionId: string): Promise<any> { return; }
 
   /**
    * Stop advertising as a beacon.
@@ -188,7 +188,7 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static stopAdvertisingAsBeacon(): Promise<any> { return; }
+  stopAdvertisingAsBeacon(): Promise<any> { return; }
 
   /**
    * Enable analytics.
@@ -203,7 +203,7 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static enableAnalytics(enable: boolean): Promise<any> { return; }
+  enableAnalytics(enable: boolean): Promise<any> { return; }
 
   /**
   * Test if analytics is enabled.
@@ -217,7 +217,7 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static isAnalyticsEnabled(): Promise<any> { return; }
+  isAnalyticsEnabled(): Promise<any> { return; }
 
   /**
   * Test if App ID and App Token is set.
@@ -231,7 +231,7 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static isAuthorized(): Promise<any> { return; }
+  isAuthorized(): Promise<any> { return; }
 
   /**
   * Set App ID and App Token.
@@ -247,7 +247,7 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static setupAppIDAndAppToken(appID: string, appToken: string): Promise<any> { return; }
+  setupAppIDAndAppToken(appID: string, appToken: string): Promise<any> { return; }
 
   /**
    * Start scanning for all nearby beacons using CoreBluetooth (no region object is used).
@@ -268,7 +268,7 @@ export class EstimoteBeacons {
     observable: true,
     clearFunction: 'stopEstimoteBeaconDiscovery'
   })
-  static startEstimoteBeaconDiscovery(): Observable<any> { return; }
+  startEstimoteBeaconDiscovery(): Observable<any> { return; }
 
   /**
    * Stop CoreBluetooth scan. Available on iOS.
@@ -285,7 +285,7 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static stopEstimoteBeaconDiscovery(): Promise<any> { return; }
+  stopEstimoteBeaconDiscovery(): Promise<any> { return; }
 
   /**
    * Start ranging beacons. Available on iOS and Android.
@@ -308,7 +308,7 @@ export class EstimoteBeacons {
     clearFunction: 'stopRangingBeaconsInRegion',
     clearWithArgs: true
   })
-  static startRangingBeaconsInRegion(region: EstimoteBeaconRegion): Observable<any> { return; }
+  startRangingBeaconsInRegion(region: EstimoteBeaconRegion): Observable<any> { return; }
 
   /**
    * Stop ranging beacons. Available on iOS and Android.
@@ -327,7 +327,7 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static stopRangingBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
+  stopRangingBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
 
   /**
    * Start ranging secure beacons. Available on iOS.
@@ -342,7 +342,7 @@ export class EstimoteBeacons {
     clearFunction: 'stopRangingSecureBeaconsInRegion',
     clearWithArgs: true
   })
-  static startRangingSecureBeaconsInRegion(region: EstimoteBeaconRegion): Observable<any> { return; }
+  startRangingSecureBeaconsInRegion(region: EstimoteBeaconRegion): Observable<any> { return; }
 
   /**
    * Stop ranging secure beacons. Available on iOS.
@@ -351,7 +351,7 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static stopRangingSecureBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
+  stopRangingSecureBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
 
   /**
    * Start monitoring beacons. Available on iOS and Android.
@@ -377,7 +377,7 @@ export class EstimoteBeacons {
     successIndex: 1,
     errorIndex: 2
   })
-  static startMonitoringForRegion(region: EstimoteBeaconRegion, notifyEntryStateOnDisplay: boolean): Observable<any> { return; }
+  startMonitoringForRegion(region: EstimoteBeaconRegion, notifyEntryStateOnDisplay: boolean): Observable<any> { return; }
 
   /**
    * Stop monitoring beacons. Available on iOS and Android.
@@ -391,7 +391,7 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static stopMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
+  stopMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
 
   /**
    * Start monitoring secure beacons. Available on iOS.
@@ -411,7 +411,7 @@ export class EstimoteBeacons {
     successIndex: 1,
     errorIndex: 2
   })
-  static startSecureMonitoringForRegion(region: EstimoteBeaconRegion, notifyEntryStateOnDisplay: boolean): Observable<any> { return; }
+  startSecureMonitoringForRegion(region: EstimoteBeaconRegion, notifyEntryStateOnDisplay: boolean): Observable<any> { return; }
 
   /**
   * Stop monitoring secure beacons. Available on iOS.
@@ -421,7 +421,7 @@ export class EstimoteBeacons {
   * @returns {Promise<any>}
   */
   @Cordova()
-  static stopSecureMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
+  stopSecureMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
 
   /**
    * Connect to Estimote Beacon. Available on Android.
@@ -441,7 +441,7 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static connectToBeacon(beacon: any): Promise<any> { return; }
+  connectToBeacon(beacon: any): Promise<any> { return; }
 
   /**
    * Disconnect from connected Estimote Beacon. Available on Android.
@@ -453,7 +453,7 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static disconnectConnectedBeacon(): Promise<any> { return; }
+  disconnectConnectedBeacon(): Promise<any> { return; }
 
   /**
    * Write proximity UUID to connected Estimote Beacon. Available on Android.
@@ -467,7 +467,7 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static writeConnectedProximityUUID(uuid: any): Promise<any> { return; }
+  writeConnectedProximityUUID(uuid: any): Promise<any> { return; }
 
   /**
    * Write major to connected Estimote Beacon. Available on Android.
@@ -481,7 +481,7 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static writeConnectedMajor(major: number): Promise<any> { return; }
+  writeConnectedMajor(major: number): Promise<any> { return; }
 
   /**
    * Write minor to connected Estimote Beacon. Available on Android.
@@ -495,7 +495,7 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static writeConnectedMinor(minor: number): Promise<any> { return; }
+  writeConnectedMinor(minor: number): Promise<any> { return; }
 
 }
 
diff --git a/src/@ionic-native/plugins/facebook/index.ts b/src/@ionic-native/plugins/facebook/index.ts
index 92fc0311e..f1a208543 100644
--- a/src/@ionic-native/plugins/facebook/index.ts
+++ b/src/@ionic-native/plugins/facebook/index.ts
@@ -117,7 +117,7 @@ export class Facebook {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static browserInit(appId: number, version?: string): Promise<any> {
+  browserInit(appId: number, version?: string): Promise<any> {
     return;
   }
 
@@ -142,7 +142,7 @@ export class Facebook {
    * @returns {Promise<FacebookLoginResponse>} Returns a Promise that resolves with a status object if login succeeds, and rejects if login fails.
    */
   @Cordova()
-  static login(permissions: string[]): Promise<FacebookLoginResponse> { return; }
+  login(permissions: string[]): Promise<FacebookLoginResponse> { return; }
 
   /**
    * Logout of Facebook.
@@ -151,7 +151,7 @@ export class Facebook {
    * @returns {Promise<any>} Returns a Promise that resolves on a successful logout, and rejects if logout fails.
    */
   @Cordova()
-  static logout(): Promise<any> { return; }
+  logout(): Promise<any> { return; }
 
   /**
    * Determine if a user is logged in to Facebook and has authenticated your app.  There are three possible states for a user:
@@ -180,7 +180,7 @@ export class Facebook {
    * @returns {Promise<any>} Returns a Promise that resolves with a status, or rejects with an error
    */
   @Cordova()
-  static getLoginStatus(): Promise<any> { return; }
+  getLoginStatus(): Promise<any> { return; }
 
   /**
    * Get a Facebook access token for using Facebook services.
@@ -188,7 +188,7 @@ export class Facebook {
    * @returns {Promise<string>} Returns a Promise that resolves with an access token, or rejects with an error
    */
   @Cordova()
-  static getAccessToken(): Promise<string> { return; }
+  getAccessToken(): Promise<string> { return; }
 
   /**
    * Show one of various Facebook dialogs. Example of options for a Share dialog:
@@ -208,7 +208,7 @@ export class Facebook {
    * @returns {Promise<any>} Returns a Promise that resolves with success data, or rejects with an error
    */
   @Cordova()
-  static showDialog(options: any): Promise<any> { return; }
+  showDialog(options: any): Promise<any> { return; }
 
   /**
    * Make a call to Facebook Graph API. Can take additional permissions beyond those granted on login.
@@ -224,7 +224,7 @@ export class Facebook {
    * @returns {Promise<any>} Returns a Promise that resolves with the result of the request, or rejects with an error
    */
   @Cordova()
-  static api(requestPath: string, permissions: string[]): Promise<any> { return; }
+  api(requestPath: string, permissions: string[]): Promise<any> { return; }
 
   /**
    * Log an event.  For more information see the Events section above.
@@ -235,7 +235,7 @@ export class Facebook {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static logEvent(
+  logEvent(
     name: string,
     params?: Object,
     valueToSum?: number
@@ -249,7 +249,7 @@ export class Facebook {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static logPurchase(value: number, currency: string): Promise<any> { return; }
+  logPurchase(value: number, currency: string): Promise<any> { return; }
 
   /**
    * Open App Invite dialog. Does not require login.
@@ -267,7 +267,7 @@ export class Facebook {
    * @returns {Promise<any>} Returns a Promise that resolves with the result data, or rejects with an error
    */
   @Cordova()
-  static appInvite(options: {
+  appInvite(options: {
     url: string,
     picture: string
   }): Promise<any> { return; }
diff --git a/src/@ionic-native/plugins/file-chooser/index.ts b/src/@ionic-native/plugins/file-chooser/index.ts
index fd108f77f..3ad3b0790 100644
--- a/src/@ionic-native/plugins/file-chooser/index.ts
+++ b/src/@ionic-native/plugins/file-chooser/index.ts
@@ -32,6 +32,6 @@ export class FileChooser {
    * @returns {Promise<string>}
    */
   @Cordova()
-  static open(): Promise<string> { return; }
+  open(): Promise<string> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/file-opener/index.ts b/src/@ionic-native/plugins/file-opener/index.ts
index 25ca82a84..4ddc0b33a 100644
--- a/src/@ionic-native/plugins/file-opener/index.ts
+++ b/src/@ionic-native/plugins/file-opener/index.ts
@@ -34,7 +34,7 @@ export class FileOpener {
     successName: 'success',
     errorName: 'error'
   })
-  static open(filePath: string, fileMIMEType: string): Promise<any> {return; }
+  open(filePath: string, fileMIMEType: string): Promise<any> {return; }
 
   /**
    * Uninstalls a package
@@ -46,7 +46,7 @@ export class FileOpener {
     successName: 'success',
     errorName: 'error'
   })
-  static uninstall(packageId: string): Promise<any> {return; }
+  uninstall(packageId: string): Promise<any> {return; }
 
   /**
    * Check if an app is already installed
@@ -58,6 +58,6 @@ export class FileOpener {
     successName: 'success',
     errorName: 'error'
   })
-  static appIsInstalled(packageId: string): Promise<any> {return; }
+  appIsInstalled(packageId: string): Promise<any> {return; }
 
 }
diff --git a/src/@ionic-native/plugins/file/index.ts b/src/@ionic-native/plugins/file/index.ts
index ec80cb993..c347909ad 100644
--- a/src/@ionic-native/plugins/file/index.ts
+++ b/src/@ionic-native/plugins/file/index.ts
@@ -390,7 +390,7 @@ export class File {
    * Get free disk space in Bytes
    * @returns {Promise<number>} Returns a promise that resolves with the remaining free disk space in Bytes
    */
-  static getFreeDiskSpace(): Promise<number> {
+  getFreeDiskSpace(): Promise<number> {
     return new Promise<any>((resolve, reject) => {
       if (!cordova || !cordova.exec) {
         pluginWarn({
@@ -411,7 +411,7 @@ export class File {
    * @param {string} dir Name of directory to check
    * @returns {Promise<boolean|FileError>} Returns a Promise that resolves to true if the directory exists or rejects with an error.
    */
-  static checkDir(path: string, dir: string): Promise<boolean|FileError> {
+  checkDir(path: string, dir: string): Promise<boolean|FileError> {
     if ((/^\//.test(dir))) {
       let err = new FileError(5);
       err.message = 'directory cannot start with \/';
@@ -435,7 +435,7 @@ export class File {
    * @param {boolean} replace If true, replaces file with same name. If false returns error
    * @returns {Promise<DirectoryEntry|FileError>} Returns a Promise that resolves with a DirectoryEntry or rejects with an error.
    */
-  static createDir(path: string, dirName: string, replace: boolean): Promise<DirectoryEntry|FileError> {
+  createDir(path: string, dirName: string, replace: boolean): Promise<DirectoryEntry|FileError> {
     if ((/^\//.test(dirName))) {
       let err = new FileError(5);
       err.message = 'directory cannot start with \/';
@@ -463,7 +463,7 @@ export class File {
    * @param {string} dirName The directory name
    * @returns {Promise<RemoveResult|FileError>} Returns a Promise that resolves to a RemoveResult or rejects with an error.
    */
-  static removeDir(path: string, dirName: string): Promise<RemoveResult|FileError> {
+  removeDir(path: string, dirName: string): Promise<RemoveResult|FileError> {
     if ((/^\//.test(dirName))) {
       let err = new FileError(5);
       err.message = 'directory cannot start with \/';
@@ -488,7 +488,7 @@ export class File {
    * @param {string} newDirName The destination directory name
    * @returns {Promise<DirectoryEntry|Entry|FileError>} Returns a Promise that resolves to the new DirectoryEntry object or rejects with an error.
    */
-  static moveDir(path: string, dirName: string, newPath: string, newDirName: string): Promise<DirectoryEntry|Entry|FileError> {
+  moveDir(path: string, dirName: string, newPath: string, newDirName: string): Promise<DirectoryEntry|Entry|FileError> {
     newDirName = newDirName || dirName;
 
     if ((/^\//.test(newDirName))) {
@@ -518,7 +518,7 @@ export class File {
    * @param {string} newDirName New name of directory to copy to (leave blank to remain the same)
    * @returns {Promise<Entry|FileError>} Returns a Promise that resolves to the new Entry object or rejects with an error.
    */
-  static copyDir(path: string, dirName: string, newPath: string, newDirName: string): Promise<Entry|FileError> {
+  copyDir(path: string, dirName: string, newPath: string, newDirName: string): Promise<Entry|FileError> {
     if ((/^\//.test(newDirName))) {
       let err = new FileError(5);
       err.message = 'directory cannot start with \/';
@@ -544,7 +544,7 @@ export class File {
    * @param {string} dirName Name of directory
    * @returns {Promise<Entry[]>} Returns a Promise that resolves to an array of Entry objects or rejects with an error.
    */
-  static listDir(path: string, dirName: string): Promise<Entry[]> {
+  listDir(path: string, dirName: string): Promise<Entry[]> {
     if ((/^\//.test(dirName))) {
       let err = new FileError(5);
       err.message = 'directory cannot start with \/';
@@ -568,7 +568,7 @@ export class File {
    * @param {string} dirName Name of directory
    * @returns {Promise<RemoveResult>} Returns a Promise that resolves with a RemoveResult or rejects with an error.
    */
-  static removeRecursively(path: string, dirName: string): Promise<RemoveResult> {
+  removeRecursively(path: string, dirName: string): Promise<RemoveResult> {
     if ((/^\//.test(dirName))) {
       let err = new FileError(5);
       err.message = 'directory cannot start with \/';
@@ -591,7 +591,7 @@ export class File {
    * @param {string} file Name of file to check
    * @returns {Promise<boolean|FileError>} Returns a Promise that resolves with a boolean or rejects with an error.
    */
-  static checkFile(path: string, file: string): Promise<boolean|FileError> {
+  checkFile(path: string, file: string): Promise<boolean|FileError> {
     if ((/^\//.test(file))) {
       let err = new FileError(5);
       err.message = 'file cannot start with \/';
@@ -620,7 +620,7 @@ export class File {
    * @param {boolean} replace If true, replaces file with same name. If false returns error
    * @returns {Promise<FileEntry|FileError>} Returns a Promise that resolves to a FileEntry or rejects with an error.
    */
-  static createFile(path: string, fileName: string, replace: boolean): Promise<FileEntry|FileError> {
+  createFile(path: string, fileName: string, replace: boolean): Promise<FileEntry|FileError> {
     if ((/^\//.test(fileName))) {
       let err = new FileError(5);
       err.message = 'file-name cannot start with \/';
@@ -648,7 +648,7 @@ export class File {
    * @param {string} fileName Name of file to remove
    * @returns {Promise<RemoveResult|FileError>} Returns a Promise that resolves to a RemoveResult or rejects with an error.
    */
-  static removeFile(path: string, fileName: string): Promise<RemoveResult|FileError> {
+  removeFile(path: string, fileName: string): Promise<RemoveResult|FileError> {
     if ((/^\//.test(fileName))) {
       let err = new FileError(5);
       err.message = 'file-name cannot start with \/';
@@ -672,7 +672,7 @@ export class File {
    * @param {WriteOptions} options replace file if set to true. See WriteOptions for more information.
    * @returns {Promise<any>} Returns a Promise that resolves to updated file entry or rejects with an error.
    */
-  static writeFile(path: string, fileName: string,
+  writeFile(path: string, fileName: string,
                    text: string | Blob, options: WriteOptions = {}): Promise<any> {
     if ((/^\//.test(fileName))) {
       const err = new FileError(5);
@@ -702,7 +702,7 @@ export class File {
    * @param {WriteOptions} options replace file if set to true. See WriteOptions for more information.
    * @returns {Promise<FileEntry>} Returns a Promise that resolves to updated file entry or rejects with an error.
    */
-  private static writeFileEntry(fe: FileEntry, text: string | Blob, options: WriteOptions) {
+  private writeFileEntry(fe: FileEntry, text: string | Blob, options: WriteOptions) {
     return File.createWriter(fe)
       .then((writer) => {
         if (options.append) {
@@ -726,7 +726,7 @@ export class File {
    * @param {string | Blob} text content or blob to write
    * @returns {Promise<void>} Returns a Promise that resolves or rejects with an error.
    */
-  static writeExistingFile(path: string, fileName: string, text: string | Blob): Promise<void> {
+  writeExistingFile(path: string, fileName: string, text: string | Blob): Promise<void> {
     return File.writeFile(path, fileName, text, { create: false });
   }
 
@@ -737,7 +737,7 @@ export class File {
    * @param {string} file Name of file, relative to path.
    * @returns {Promise<string|FileError>} Returns a Promise that resolves with the contents of the file as string or rejects with an error.
    */
-  static readAsText(path: string, file: string): Promise<string|FileError> {
+  readAsText(path: string, file: string): Promise<string|FileError> {
     if ((/^\//.test(file))) {
       let err = new FileError(5);
       err.message = 'file-name cannot start with \/';
@@ -778,7 +778,7 @@ export class File {
    * @param {string} file Name of file, relative to path.
    * @returns {Promise<string|FileError>} Returns a Promise that resolves with the contents of the file as data URL or rejects with an error.
    */
-  static readAsDataURL(path: string, file: string): Promise<string|FileError> {
+  readAsDataURL(path: string, file: string): Promise<string|FileError> {
     if ((/^\//.test(file))) {
       let err = new FileError(5);
       err.message = 'file-name cannot start with \/';
@@ -820,7 +820,7 @@ export class File {
    * @param {string} file Name of file, relative to path.
    * @returns {Promise<string|FileError>} Returns a Promise that resolves with the contents of the file as string rejects with an error.
    */
-  static readAsBinaryString(path: string, file: string): Promise<string|FileError> {
+  readAsBinaryString(path: string, file: string): Promise<string|FileError> {
     if ((/^\//.test(file))) {
       let err = new FileError(5);
       err.message = 'file-name cannot start with \/';
@@ -861,7 +861,7 @@ export class File {
    * @param {string} file Name of file, relative to path.
    * @returns {Promise<ArrayBuffer|FileError>} Returns a Promise that resolves with the contents of the file as ArrayBuffer or rejects with an error.
    */
-  static readAsArrayBuffer(path: string, file: string): Promise<ArrayBuffer|FileError> {
+  readAsArrayBuffer(path: string, file: string): Promise<ArrayBuffer|FileError> {
     if ((/^\//.test(file))) {
       let err = new FileError(5);
       err.message = 'file-name cannot start with \/';
@@ -904,7 +904,7 @@ export class File {
    * @param {string} newFileName New name of file to move to (leave blank to remain the same)
    * @returns {Promise<Entry|FileError>} Returns a Promise that resolves to the new Entry or rejects with an error.
    */
-  static moveFile(path: string, fileName: string, newPath: string, newFileName: string): Promise<Entry|FileError> {
+  moveFile(path: string, fileName: string, newPath: string, newFileName: string): Promise<Entry|FileError> {
     newFileName = newFileName || fileName;
 
     if ((/^\//.test(newFileName))) {
@@ -934,7 +934,7 @@ export class File {
    * @param {string} newFileName New name of file to copy to (leave blank to remain the same)
    * @returns {Promise<Entry|FileError>} Returns a Promise that resolves to an Entry or rejects with an error.
    */
-  static copyFile(path: string, fileName: string, newPath: string, newFileName: string): Promise<Entry|FileError> {
+  copyFile(path: string, fileName: string, newPath: string, newFileName: string): Promise<Entry|FileError> {
     newFileName = newFileName || fileName;
 
     if ((/^\//.test(newFileName))) {
@@ -961,7 +961,7 @@ export class File {
   /**
    * @private
    */
-  private static fillErrorMessage(err: FileError): void {
+  private fillErrorMessage(err: FileError): void {
     err.message = File.cordovaFileError[err.code];
   }
 
@@ -970,7 +970,7 @@ export class File {
    * @param fileUrl {string} file system url
    * @returns {Promise<Entry>}
    */
-  static resolveLocalFilesystemUrl(fileUrl: string): Promise<Entry> {
+  resolveLocalFilesystemUrl(fileUrl: string): Promise<Entry> {
     return new Promise<Entry>((resolve, reject) => {
       try {
         window.resolveLocalFileSystemURL(fileUrl, (entry) => {
@@ -991,7 +991,7 @@ export class File {
    * @param directoryUrl {string} directory system url
    * @returns {Promise<DirectoryEntry>}
    */
-  static resolveDirectoryUrl(directoryUrl: string): Promise<DirectoryEntry> {
+  resolveDirectoryUrl(directoryUrl: string): Promise<DirectoryEntry> {
     return File.resolveLocalFilesystemUrl(directoryUrl)
       .then((de) => {
         if (de.isDirectory) {
@@ -1011,7 +1011,7 @@ export class File {
    * @param flags {Flags} Options
    * @returns {Promise<DirectoryEntry>}
    */
-  static getDirectory(directoryEntry: DirectoryEntry, directoryName: string, flags: Flags): Promise<DirectoryEntry> {
+  getDirectory(directoryEntry: DirectoryEntry, directoryName: string, flags: Flags): Promise<DirectoryEntry> {
     return new Promise<DirectoryEntry>((resolve, reject) => {
       try {
         directoryEntry.getDirectory(directoryName, flags, (de) => {
@@ -1034,7 +1034,7 @@ export class File {
    * @param flags {Flags} Options
    * @returns {Promise<FileEntry>}
    */
-  static getFile(directoryEntry: DirectoryEntry, fileName: string, flags: Flags): Promise<FileEntry> {
+  getFile(directoryEntry: DirectoryEntry, fileName: string, flags: Flags): Promise<FileEntry> {
     return new Promise<FileEntry>((resolve, reject) => {
       try {
         directoryEntry.getFile(fileName, flags, resolve, (err) => {
@@ -1051,7 +1051,7 @@ export class File {
   /**
    * @private
    */
-  private static remove(fe: Entry): Promise<RemoveResult> {
+  private remove(fe: Entry): Promise<RemoveResult> {
     return new Promise<RemoveResult>((resolve, reject) => {
       fe.remove(() => {
         resolve({success: true, fileRemoved: fe});
@@ -1065,7 +1065,7 @@ export class File {
   /**
    * @private
    */
-  private static move(srce: Entry, destdir: DirectoryEntry, newName: string): Promise<Entry> {
+  private move(srce: Entry, destdir: DirectoryEntry, newName: string): Promise<Entry> {
     return new Promise<Entry>((resolve, reject) => {
       srce.moveTo(destdir, newName, (deste) => {
         resolve(deste);
@@ -1079,7 +1079,7 @@ export class File {
   /**
    * @private
    */
-  private static copy(srce: Entry, destdir: DirectoryEntry, newName: string): Promise<Entry> {
+  private copy(srce: Entry, destdir: DirectoryEntry, newName: string): Promise<Entry> {
     return new Promise<Entry>((resolve, reject) => {
       srce.copyTo(destdir, newName, (deste) => {
         resolve(deste);
@@ -1093,7 +1093,7 @@ export class File {
   /**
    * @private
    */
-  private static readEntries(dr: DirectoryReader): Promise<Entry[]> {
+  private readEntries(dr: DirectoryReader): Promise<Entry[]> {
     return new Promise<Entry[]>((resolve, reject) => {
       dr.readEntries((entries) => {
         resolve(entries);
@@ -1107,7 +1107,7 @@ export class File {
   /**
    * @private
    */
-  private static rimraf(de: DirectoryEntry): Promise<RemoveResult> {
+  private rimraf(de: DirectoryEntry): Promise<RemoveResult> {
     return new Promise<RemoveResult>((resolve, reject) => {
       de.removeRecursively(() => {
         resolve({success: true, fileRemoved: de});
@@ -1121,7 +1121,7 @@ export class File {
   /**
    * @private
    */
-  private static createWriter(fe: FileEntry): Promise<FileWriter> {
+  private createWriter(fe: FileEntry): Promise<FileWriter> {
     return new Promise<FileWriter>((resolve, reject) => {
       fe.createWriter((writer) => {
         resolve(writer);
@@ -1135,7 +1135,7 @@ export class File {
   /**
    * @private
    */
-  private static write(writer: FileWriter, gu: string | Blob): Promise<any> {
+  private write(writer: FileWriter, gu: string | Blob): Promise<any> {
     if (gu instanceof Blob) {
       return this.writeFileInChunks(writer, gu);
     }
@@ -1155,7 +1155,7 @@ export class File {
   /**
    * @private
    */
-  private static writeFileInChunks(writer: FileWriter, file: Blob) {
+  private writeFileInChunks(writer: FileWriter, file: Blob) {
     const BLOCK_SIZE = 1024 * 1024;
     let writtenSize = 0;
 
diff --git a/src/@ionic-native/plugins/filepath/index.ts b/src/@ionic-native/plugins/filepath/index.ts
index e53587e40..707bc3b76 100644
--- a/src/@ionic-native/plugins/filepath/index.ts
+++ b/src/@ionic-native/plugins/filepath/index.ts
@@ -35,6 +35,6 @@ export class FilePath {
    * @returns {Promise<string>}
    */
   @Cordova()
-  static resolveNativePath(path: string): Promise<string> {return; }
+  resolveNativePath(path: string): Promise<string> {return; }
 
 }
diff --git a/src/@ionic-native/plugins/fingerprint-aio/index.ts b/src/@ionic-native/plugins/fingerprint-aio/index.ts
index 32bfe3560..a52c35897 100644
--- a/src/@ionic-native/plugins/fingerprint-aio/index.ts
+++ b/src/@ionic-native/plugins/fingerprint-aio/index.ts
@@ -51,7 +51,7 @@ export class FingerprintAIO {
    * @return {Promise<any>} Returns a promise with result
    */
   @Cordova()
-  static isAvailable(): Promise<any> { return; }
+  isAvailable(): Promise<any> { return; }
 
   /**
    * Show authentication dialogue
@@ -59,6 +59,6 @@ export class FingerprintAIO {
    * @return {Promise<any>} Returns a promise that resolves when authentication was successfull
    */
   @Cordova()
-  static show(options: FingerprintOptions): Promise<any> { return; }
+  show(options: FingerprintOptions): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/firebase/index.ts b/src/@ionic-native/plugins/firebase/index.ts
index 6ebfe3153..8077e5b68 100644
--- a/src/@ionic-native/plugins/firebase/index.ts
+++ b/src/@ionic-native/plugins/firebase/index.ts
@@ -35,7 +35,7 @@ export class Firebase {
    * @return {Promise<any>}
    */
   @Cordova()
-  static getToken(): Promise<any> { return; }
+  getToken(): Promise<any> { return; }
 
   /**
    * Get notified when a token is refreshed
@@ -44,7 +44,7 @@ export class Firebase {
   @Cordova({
     observable: true
   })
-  static onTokenRefresh(): Observable<any> { return; }
+  onTokenRefresh(): Observable<any> { return; }
 
   /**
    * Get notified when the user opens a notification
@@ -53,7 +53,7 @@ export class Firebase {
   @Cordova({
     observable: true
   })
-  static onNotificationOpen(): Observable<any> { return; }
+  onNotificationOpen(): Observable<any> { return; }
 
   /**
    * Grant permission to recieve push notifications
@@ -62,7 +62,7 @@ export class Firebase {
   @Cordova({
     platforms: ['iOS']
   })
-  static grantPermission(): Promise<any> { return; }
+  grantPermission(): Promise<any> { return; }
 
   /**
    * Set icon badge number. Set to 0 to clear the badge.
@@ -70,14 +70,14 @@ export class Firebase {
    * @return {Promise<any>}
    */
   @Cordova()
-  static setBadgeNumber(badgeNumber: number): Promise<any> { return; }
+  setBadgeNumber(badgeNumber: number): Promise<any> { return; }
 
   /**
    * Get icon badge number
    * @return {Promise<any>}
    */
   @Cordova()
-  static getBadgeNumber(): Promise<any> { return; }
+  getBadgeNumber(): Promise<any> { return; }
 
   /**
    * Subscribe to a topic
@@ -85,7 +85,7 @@ export class Firebase {
    * @return {Promise<any>}
    */
   @Cordova()
-  static subscribe(topic: string): Promise<any> { return; }
+  subscribe(topic: string): Promise<any> { return; }
 
   /**
    * Unsubscribe from a topic
@@ -93,7 +93,7 @@ export class Firebase {
    * @return {Promise<any>}
    */
   @Cordova()
-  static unsubscribe(topic: string): Promise<any> { return; }
+  unsubscribe(topic: string): Promise<any> { return; }
 
   /**
    * Log an event using Analytics
@@ -102,7 +102,7 @@ export class Firebase {
    * @return {Promise<any>}
    */
   @Cordova()
-  static logEvent(type: string, data: any): Promise<any> { return; }
+  logEvent(type: string, data: any): Promise<any> { return; }
 
   /**
    * Set a user id for use in Analytics
@@ -110,7 +110,7 @@ export class Firebase {
    * @return {Promise<any>}
    */
   @Cordova()
-  static setUserId(userId: string): Promise<any> { return; }
+  setUserId(userId: string): Promise<any> { return; }
 
   /**
    * Set a user property for use in Analytics
@@ -119,7 +119,7 @@ export class Firebase {
    * @return {Promise<any>}
    */
   @Cordova()
-  static setUserProperty(name: string, value: string): Promise<any> { return; }
+  setUserProperty(name: string, value: string): Promise<any> { return; }
 
   /**
    * Fetch Remote Config parameter values for your app
@@ -131,7 +131,7 @@ export class Firebase {
     successIndex: 1,
     errorIndex: 2
   })
-  static fetch(cacheExpirationSeconds?: number): Promise<any> { return; }
+  fetch(cacheExpirationSeconds?: number): Promise<any> { return; }
 
   /**
    * Activate the Remote Config fetched config
@@ -140,7 +140,7 @@ export class Firebase {
   @Cordova({
     platforms: ['Android']
   })
-  static activateFetched(): Promise<any> { return; }
+  activateFetched(): Promise<any> { return; }
 
   /**
    * Retrieve a Remote Config value
@@ -153,7 +153,7 @@ export class Firebase {
     successIndex: 2,
     errorIndex: 3
   })
-  static getValue(key: string, namespace?: string): Promise<any> { return; }
+  getValue(key: string, namespace?: string): Promise<any> { return; }
 
   /**
    * Retrieve a Remote Config byte array
@@ -166,7 +166,7 @@ export class Firebase {
     successIndex: 2,
     errorIndex: 3
   })
-  static getByteArray(key: string, namespace?: string): Promise<any> { return; }
+  getByteArray(key: string, namespace?: string): Promise<any> { return; }
 
   /**
    * Get the current state of the FirebaseRemoteConfig singleton object
@@ -175,7 +175,7 @@ export class Firebase {
   @Cordova({
     platforms: ['Android']
   })
-  static getInfo(): Promise<any> { return; }
+  getInfo(): Promise<any> { return; }
 
   /**
    * Change the settings for the FirebaseRemoteConfig object's operations
@@ -185,7 +185,7 @@ export class Firebase {
   @Cordova({
     platforms: ['Android']
   })
-  static setConfigSettings(settings: any): Promise<any> { return; }
+  setConfigSettings(settings: any): Promise<any> { return; }
 
   /**
    * Set defaults in the Remote Config
@@ -198,6 +198,6 @@ export class Firebase {
     successIndex: 2,
     errorIndex: 3
   })
-  static setDefaults(defaults: any, namespace: string): Promise<any> { return; }
+  setDefaults(defaults: any, namespace: string): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/flashlight/index.ts b/src/@ionic-native/plugins/flashlight/index.ts
index 708a9e67d..bc174d783 100644
--- a/src/@ionic-native/plugins/flashlight/index.ts
+++ b/src/@ionic-native/plugins/flashlight/index.ts
@@ -29,28 +29,28 @@ export class Flashlight {
    * @returns {Promise<boolean>} Returns a promise that resolves with a boolean stating if the flashlight is available.
    */
   @Cordova()
-  static available(): Promise<boolean> { return; }
+  available(): Promise<boolean> { return; }
 
   /**
    * Switches the flashlight on
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  static switchOn(): Promise<boolean> { return; }
+  switchOn(): Promise<boolean> { return; }
 
   /**
    * Switches the flashlight off
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  static switchOff(): Promise<boolean> { return; }
+  switchOff(): Promise<boolean> { return; }
 
   /**
    * Toggles the flashlight
    * @returns {Promise<any>}
    */
   @Cordova()
-  static toggle(): Promise<any> { return; }
+  toggle(): Promise<any> { return; }
 
 
   /**
@@ -60,6 +60,6 @@ export class Flashlight {
   @Cordova({
     sync: true
   })
-  static isSwitchedOn(): boolean { return; }
+  isSwitchedOn(): boolean { return; }
 
 }
diff --git a/src/@ionic-native/plugins/geofence/index.ts b/src/@ionic-native/plugins/geofence/index.ts
index 50febe001..159999b23 100644
--- a/src/@ionic-native/plugins/geofence/index.ts
+++ b/src/@ionic-native/plugins/geofence/index.ts
@@ -100,7 +100,7 @@ export class Geofence {
    * @returns {Promise<void>}
    */
   @Cordova()
-  static initialize(): Promise<void> { return; };
+  initialize(): Promise<void> { return; };
 
   /**
    * Adds a new geofence or array of geofences. For geofence object, see above.
@@ -108,7 +108,7 @@ export class Geofence {
    * @returns {Promise<void>}
    */
   @Cordova()
-  static addOrUpdate(geofences: Object | Array<Object>): Promise<void> { return; };
+  addOrUpdate(geofences: Object | Array<Object>): Promise<void> { return; };
 
   /**
    * Removes a geofence or array of geofences. `geofenceID` corresponds to one or more IDs specified when the
@@ -117,7 +117,7 @@ export class Geofence {
    * @returns {Promise<void>}
    */
   @Cordova()
-  static remove(geofenceId: string | Array<string>): Promise<void> { return; };
+  remove(geofenceId: string | Array<string>): Promise<void> { return; };
 
   /**
    * Removes all geofences.
@@ -125,7 +125,7 @@ export class Geofence {
    * @returns {Promise<void>}
    */
   @Cordova()
-  static removeAll(): Promise<void> { return; };
+  removeAll(): Promise<void> { return; };
 
   /**
    * Returns an array of geofences currently being monitored.
@@ -133,14 +133,14 @@ export class Geofence {
    * @returns {Promise<Array<string>>}
    */
   @Cordova()
-  static getWatched(): Promise<string> { return; };
+  getWatched(): Promise<string> { return; };
 
   /**
    * Called when a geofence is crossed in the direction specified by `TransitType`.
    *
    * @returns {Observable<any>}
    */
-  static onTransitionReceived(): Observable<any> {
+  onTransitionReceived(): Observable<any> {
 
     return new Observable<any>((observer) => {
       window && window.geofence && (window.geofence.onTransitionReceived = observer.next.bind(observer));
@@ -154,7 +154,7 @@ export class Geofence {
    *
    * @returns {Observable<any>}
    */
-  static onNotificationClicked(): Observable<any> {
+  onNotificationClicked(): Observable<any> {
 
     return new Observable<any>((observer) => {
       window && window.geofence && (window.geofence.onNotificationClicked = observer.next.bind(observer));
diff --git a/src/@ionic-native/plugins/geolocation/index.ts b/src/@ionic-native/plugins/geolocation/index.ts
index a2b1c1676..3d1b71140 100644
--- a/src/@ionic-native/plugins/geolocation/index.ts
+++ b/src/@ionic-native/plugins/geolocation/index.ts
@@ -161,7 +161,7 @@ export class Geolocation {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static getCurrentPosition(options?: GeolocationOptions): Promise<Geoposition> { return; }
+  getCurrentPosition(options?: GeolocationOptions): Promise<Geoposition> { return; }
 
   /**
    * Watch the current device's position.  Clear the watch by unsubscribing from
@@ -181,7 +181,7 @@ export class Geolocation {
    * @param {GeolocationOptions} options  The [geolocation options](https://developer.mozilla.org/en-US/docs/Web/API/PositionOptions).
    * @returns {Observable<Geoposition>} Returns an Observable that notifies with the [position](https://developer.mozilla.org/en-US/docs/Web/API/Position) of the device, or errors.
    */
-  static watchPosition(options?: GeolocationOptions): Observable<Geoposition> {
+  watchPosition(options?: GeolocationOptions): Observable<Geoposition> {
     return new Observable<Geoposition>(
       (observer: any) => {
         let watchId = navigator.geolocation.watchPosition(observer.next.bind(observer), observer.next.bind(observer), options);
diff --git a/src/@ionic-native/plugins/globalization/index.ts b/src/@ionic-native/plugins/globalization/index.ts
index 552a5c29b..077b14bc8 100644
--- a/src/@ionic-native/plugins/globalization/index.ts
+++ b/src/@ionic-native/plugins/globalization/index.ts
@@ -26,14 +26,14 @@ export class Globalization {
    * @returns {Promise<{value: string}>}
    */
   @Cordova()
-  static getPreferredLanguage(): Promise<{ value: string }> { return; }
+  getPreferredLanguage(): Promise<{ value: string }> { return; }
 
   /**
    * Returns the BCP 47 compliant locale identifier string to the successCallback with a properties object as a parameter.
    * @returns {Promise<{value: string}>}
    */
   @Cordova()
-  static getLocaleName(): Promise<{ value: string }> { return; }
+  getLocaleName(): Promise<{ value: string }> { return; }
 
   /**
    * Converts date to string
@@ -45,7 +45,7 @@ export class Globalization {
     successIndex: 1,
     errorIndex: 2
   })
-  static dateToString(date: Date, options: { formatLength: string, selector: string }): Promise<{ value: string }> { return; }
+  dateToString(date: Date, options: { formatLength: string, selector: string }): Promise<{ value: string }> { return; }
 
   /**
    * Parses a date formatted as a string, according to the client's user preferences and calendar using the time zone of the client, and returns the corresponding date object.
@@ -57,7 +57,7 @@ export class Globalization {
     successIndex: 1,
     errorIndex: 2
   })
-  static stringToDate(dateString: string, options: { formatLength: string, selector: string }): Promise<{ year: number, month: number, day: number, hour: number, minute: number, second: number, millisecond: number }> { return; }
+  stringToDate(dateString: string, options: { formatLength: string, selector: string }): Promise<{ year: number, month: number, day: number, hour: number, minute: number, second: number, millisecond: number }> { return; }
 
   /**
    * Returns a pattern string to format and parse dates according to the client's user preferences.
@@ -67,7 +67,7 @@ export class Globalization {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static getDatePattern(options: { formatLength: string, selector: string }): Promise<{ pattern: string }> { return; }
+  getDatePattern(options: { formatLength: string, selector: string }): Promise<{ pattern: string }> { return; }
 
   /**
    * Returns an array of the names of the months or days of the week, depending on the client's user preferences and calendar.
@@ -77,7 +77,7 @@ export class Globalization {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static getDateNames(options: { type: string, item: string }): Promise<{ value: Array<string> }> { return; }
+  getDateNames(options: { type: string, item: string }): Promise<{ value: Array<string> }> { return; }
 
   /**
    * Indicates whether daylight savings time is in effect for a given date using the client's time zone and calendar.
@@ -85,14 +85,14 @@ export class Globalization {
    * @returns {Promise<{dst: string}>} reutrns a promise with the value
    */
   @Cordova()
-  static isDayLightSavingsTime(date: Date): Promise<{ dst: string }> { return; }
+  isDayLightSavingsTime(date: Date): Promise<{ dst: string }> { return; }
 
   /**
    * Returns the first day of the week according to the client's user preferences and calendar.
    * @returns {Promise<{value: string}>} returns a promise with the value
    */
   @Cordova()
-  static getFirstDayOfWeek(): Promise<{ value: string }> { return; }
+  getFirstDayOfWeek(): Promise<{ value: string }> { return; }
 
   /**
    * Returns a number formatted as a string according to the client's user preferences.
@@ -103,7 +103,7 @@ export class Globalization {
     successIndex: 1,
     errorIndex: 2
   })
-  static numberToString(numberToConvert: number, options: { type: string }): Promise<{ value: string }> { return; }
+  numberToString(numberToConvert: number, options: { type: string }): Promise<{ value: string }> { return; }
 
   /**
    *
@@ -115,7 +115,7 @@ export class Globalization {
     successIndex: 1,
     errorIndex: 2
   })
-  static stringToNumber(stringToConvert: string, options: { type: string }): Promise<{ value: number | string }> { return; }
+  stringToNumber(stringToConvert: string, options: { type: string }): Promise<{ value: number | string }> { return; }
 
   /**
    * Returns a pattern string to format and parse numbers according to the client's user preferences.
@@ -125,7 +125,7 @@ export class Globalization {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static getNumberPattern(options: { type: string }): Promise<{ pattern: string, symbol: string, fraction: number, rounding: number, positive: string, negative: string, decimal: string, grouping: string }> { return; }
+  getNumberPattern(options: { type: string }): Promise<{ pattern: string, symbol: string, fraction: number, rounding: number, positive: string, negative: string, decimal: string, grouping: string }> { return; }
 
   /**
    * Returns a pattern string to format and parse currency values according to the client's user preferences and ISO 4217 currency code.
@@ -133,6 +133,6 @@ export class Globalization {
    * @returns {Promise<{ pattern: string, code: string, fraction: number, rounding: number, decimal: number, grouping: string }>}
    */
   @Cordova()
-  static getCurrencyPattern(currencyCode: string): Promise<{ pattern: string, code: string, fraction: number, rounding: number, decimal: number, grouping: string }> { return; }
+  getCurrencyPattern(currencyCode: string): Promise<{ pattern: string, code: string, fraction: number, rounding: number, decimal: number, grouping: string }> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/google-plus/index.ts b/src/@ionic-native/plugins/google-plus/index.ts
index 8594c6f16..07e48f0d9 100644
--- a/src/@ionic-native/plugins/google-plus/index.ts
+++ b/src/@ionic-native/plugins/google-plus/index.ts
@@ -34,7 +34,7 @@ export class GooglePlus {
     successIndex: 1,
     errorIndex: 2
   })
-  static login(options?: any): Promise<any> { return; }
+  login(options?: any): Promise<any> { return; }
 
   /**
    * You can call trySilentLogin to check if they're already signed in to the app and sign them in silently if they are.
@@ -42,20 +42,20 @@ export class GooglePlus {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static trySilentLogin(options?: any): Promise<any> { return; }
+  trySilentLogin(options?: any): Promise<any> { return; }
 
   /**
    * This will clear the OAuth2 token.
    * @returns {Promise<any>}
    */
   @Cordova()
-  static logout(): Promise<any> { return; }
+  logout(): Promise<any> { return; }
 
   /**
    * This will clear the OAuth2 token, forget which account was used to login, and disconnect that account from the app. This will require the user to allow the app access again next time they sign in. Be aware that this effect is not always instantaneous. It can take time to completely disconnect.
    * @returns {Promise<any>}
    */
   @Cordova()
-  static disconnect(): Promise<any> { return; }
+  disconnect(): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/googleanalytics/index.ts b/src/@ionic-native/plugins/googleanalytics/index.ts
index 0c837126c..ab1583cec 100644
--- a/src/@ionic-native/plugins/googleanalytics/index.ts
+++ b/src/@ionic-native/plugins/googleanalytics/index.ts
@@ -47,7 +47,7 @@ export class GoogleAnalytics {
     successIndex: 2,
     errorIndex: 3
   })
-  static startTrackerWithId(id: string, interval?: number): Promise<any> { return; }
+  startTrackerWithId(id: string, interval?: number): Promise<any> { return; }
 
   /**
    * Enabling Advertising Features in Google Analytics allows you to take advantage of Remarketing, Demographics & Interests reports, and more
@@ -55,7 +55,7 @@ export class GoogleAnalytics {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static setAllowIDFACollection(allow: boolean): Promise<any> { return; }
+  setAllowIDFACollection(allow: boolean): Promise<any> { return; }
 
   /**
    * Set a UserId
@@ -64,7 +64,7 @@ export class GoogleAnalytics {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static setUserId(id: string): Promise<any> { return; }
+  setUserId(id: string): Promise<any> { return; }
 
   /**
    * Set a anonymize Ip address
@@ -72,7 +72,7 @@ export class GoogleAnalytics {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static setAnonymizeIp(anonymize: boolean): Promise<any> { return; }
+  setAnonymizeIp(anonymize: boolean): Promise<any> { return; }
 
   /**
    * Sets the app version
@@ -80,7 +80,7 @@ export class GoogleAnalytics {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static setAppVersion(appVersion: string): Promise<any> { return; }
+  setAppVersion(appVersion: string): Promise<any> { return; }
 
   /**
    * Set OptOut
@@ -88,14 +88,14 @@ export class GoogleAnalytics {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static setOptOut(optout: boolean): Promise<any> { return; }
+  setOptOut(optout: boolean): Promise<any> { return; }
 
   /**
    * Enable verbose logging
    * @returns {Promise<any>}
    */
   @Cordova()
-  static debugMode(): Promise<any> { return; }
+  debugMode(): Promise<any> { return; }
 
   /**
    * Track custom metric
@@ -107,7 +107,7 @@ export class GoogleAnalytics {
     successIndex: 2,
     errorIndex: 3
   })
-  static trackMetric(key: string, value?: any): Promise<any> { return; }
+  trackMetric(key: string, value?: any): Promise<any> { return; }
 
   /**
    * Track a screen
@@ -122,7 +122,7 @@ export class GoogleAnalytics {
     successIndex: 3,
     errorIndex: 4
   })
-  static trackView(title: string, campaignUrl?: string, newSession?: boolean): Promise<any> { return; }
+  trackView(title: string, campaignUrl?: string, newSession?: boolean): Promise<any> { return; }
 
   /**
    * Add a Custom Dimension
@@ -132,7 +132,7 @@ export class GoogleAnalytics {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static addCustomDimension(key: number, value: string): Promise<any> { return; }
+  addCustomDimension(key: number, value: string): Promise<any> { return; }
 
   /**
    * Track an event
@@ -148,7 +148,7 @@ export class GoogleAnalytics {
     successIndex: 5,
     errorIndex: 6
   })
-  static trackEvent(category: string, action: string, label?: string, value?: number, newSession?: boolean): Promise<any> { return; }
+  trackEvent(category: string, action: string, label?: string, value?: number, newSession?: boolean): Promise<any> { return; }
 
   /**
    * Track an exception
@@ -157,7 +157,7 @@ export class GoogleAnalytics {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static trackException(description: string, fatal: boolean): Promise<any> { return; }
+  trackException(description: string, fatal: boolean): Promise<any> { return; }
 
   /**
    * Track User Timing (App Speed)
@@ -168,7 +168,7 @@ export class GoogleAnalytics {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static trackTiming(category: string, intervalInMilliseconds: number, variable: string, label: string): Promise<any> { return; }
+  trackTiming(category: string, intervalInMilliseconds: number, variable: string, label: string): Promise<any> { return; }
 
   /**
    * Add a Transaction (Ecommerce)
@@ -182,7 +182,7 @@ export class GoogleAnalytics {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static addTransaction(id: string, affiliation: string, revenue: number, tax: number, shipping: number, currencyCode: string): Promise<any> { return; }
+  addTransaction(id: string, affiliation: string, revenue: number, tax: number, shipping: number, currencyCode: string): Promise<any> { return; }
 
   /**
    * Add a Transaction Item (Ecommerce)
@@ -197,7 +197,7 @@ export class GoogleAnalytics {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static addTransactionItem(id: string, name: string, sku: string, category: string, price: number, quantity: number, currencyCode: string): Promise<any> { return; }
+  addTransactionItem(id: string, name: string, sku: string, category: string, price: number, quantity: number, currencyCode: string): Promise<any> { return; }
 
   /**
    * Enable/disable automatic reporting of uncaught exceptions
@@ -205,6 +205,6 @@ export class GoogleAnalytics {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static enableUncaughtExceptionReporting(shouldEnable: boolean): Promise<any> { return; }
+  enableUncaughtExceptionReporting(shouldEnable: boolean): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/googlemap/index.ts b/src/@ionic-native/plugins/googlemap/index.ts
index 8e74ece41..db6e9150f 100644
--- a/src/@ionic-native/plugins/googlemap/index.ts
+++ b/src/@ionic-native/plugins/googlemap/index.ts
@@ -121,7 +121,7 @@ export class GoogleMap {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  static isAvailable(): Promise<boolean> { return; }
+  isAvailable(): Promise<boolean> { return; }
 
   constructor(element: string | HTMLElement, options?: any) {
     if (!!getPlugin('plugin.google.maps.Map')) {
@@ -1762,7 +1762,7 @@ export class Geocoder {
    * @param {GeocoderRequest} request Request object with either an address or a position
    * @returns {Promise<GeocoderResult[]>}
    */
-  static geocode(request: GeocoderRequest): Promise<GeocoderResult[] | any> {
+  geocode(request: GeocoderRequest): Promise<GeocoderResult[] | any> {
     return new Promise<GeocoderResult[]>((resolve, reject) => {
       if (!plugin || !plugin.google || !plugin.google.maps || !plugin.google.maps.Geocoder) {
         pluginWarn({
diff --git a/src/@ionic-native/plugins/headercolor/index.ts b/src/@ionic-native/plugins/headercolor/index.ts
index 2975d1d71..a36a777ba 100644
--- a/src/@ionic-native/plugins/headercolor/index.ts
+++ b/src/@ionic-native/plugins/headercolor/index.ts
@@ -33,6 +33,6 @@ export class HeaderColor {
     successName: 'success',
     errorName: 'failure'
   })
-  static tint(color: string): Promise<any> { return; }
+  tint(color: string): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/hotspot/index.ts b/src/@ionic-native/plugins/hotspot/index.ts
index f1d62c2c4..0279b3012 100644
--- a/src/@ionic-native/plugins/hotspot/index.ts
+++ b/src/@ionic-native/plugins/hotspot/index.ts
@@ -137,13 +137,13 @@ export class Hotspot {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  static isAvailable(): Promise<boolean> { return; }
+  isAvailable(): Promise<boolean> { return; }
 
   /**
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  static toggleWifi(): Promise<boolean> { return; }
+  toggleWifi(): Promise<boolean> { return; }
 
   /**
    * Configures and starts hotspot with SSID and Password
@@ -155,7 +155,7 @@ export class Hotspot {
    * @returns {Promise<void>}        - Promise to call once hotspot is started, or reject upon failure
    */
   @Cordova()
-  static createHotspot(ssid: string, mode: string, password: string): Promise<void> { return; }
+  createHotspot(ssid: string, mode: string, password: string): Promise<void> { return; }
 
   /**
    * Turns on Access Point
@@ -163,7 +163,7 @@ export class Hotspot {
    * @returns {Promise<boolean>} - true if AP is started
    */
   @Cordova()
-  static startHotspot(): Promise<boolean> { return; }
+  startHotspot(): Promise<boolean> { return; }
 
   /**
    * Configures hotspot with SSID and Password
@@ -175,7 +175,7 @@ export class Hotspot {
    * @returns {Promise<void>}        - Promise to call when hotspot is configured, or reject upon failure
    */
   @Cordova()
-  static configureHotspot(ssid: string, mode: string, password: string): Promise<void> { return; }
+  configureHotspot(ssid: string, mode: string, password: string): Promise<void> { return; }
 
   /**
    * Turns off Access Point
@@ -183,7 +183,7 @@ export class Hotspot {
    * @returns {Promise<boolean>} - Promise to turn off the hotspot, true on success, false on failure
    */
   @Cordova()
-  static stopHotspot(): Promise<boolean> { return; }
+  stopHotspot(): Promise<boolean> { return; }
 
   /**
    * Checks if hotspot is enabled
@@ -191,13 +191,13 @@ export class Hotspot {
    * @returns {Promise<void>}    - Promise that hotspot is enabled, rejected if it is not enabled
    */
   @Cordova()
-  static isHotspotEnabled(): Promise<void> { return; }
+  isHotspotEnabled(): Promise<void> { return; }
 
   /**
    * @returns {Promise<Array<HotspotDevice>>}
    */
   @Cordova()
-  static getAllHotspotDevices(): Promise<Array<HotspotDevice>> { return; }
+  getAllHotspotDevices(): Promise<Array<HotspotDevice>> { return; }
 
   /**
    * Connect to a WiFi network
@@ -211,7 +211,7 @@ export class Hotspot {
    *      Promise that connection to the WiFi network was successfull, rejected if unsuccessful
    */
   @Cordova()
-  static connectToWifi(ssid: string, password: string): Promise<void> { return; }
+  connectToWifi(ssid: string, password: string): Promise<void> { return; }
 
   /**
    * Connect to a WiFi network
@@ -229,7 +229,7 @@ export class Hotspot {
    *      Promise that connection to the WiFi network was successfull, rejected if unsuccessful
    */
   @Cordova()
-  static connectToWifiAuthEncrypt(ssid: string, password: string, authentication: string, encryption: Array<string>): Promise<void> { return; }
+  connectToWifiAuthEncrypt(ssid: string, password: string, authentication: string, encryption: Array<string>): Promise<void> { return; }
 
   /**
    * Add a WiFi network
@@ -245,7 +245,7 @@ export class Hotspot {
    *      Promise that adding the WiFi network was successfull, rejected if unsuccessful
    */
   @Cordova()
-  static addWifiNetwork(ssid: string, mode: string, password: string): Promise<void> { return; }
+  addWifiNetwork(ssid: string, mode: string, password: string): Promise<void> { return; }
 
   /**
    * Remove a WiFi network
@@ -257,79 +257,79 @@ export class Hotspot {
    *      Promise that removing the WiFi network was successfull, rejected if unsuccessful
    */
   @Cordova()
-  static removeWifiNetwork(ssid: string): Promise<void> { return; }
+  removeWifiNetwork(ssid: string): Promise<void> { return; }
 
   /**
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  static isConnectedToInternet(): Promise<boolean> { return; }
+  isConnectedToInternet(): Promise<boolean> { return; }
 
   /**
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  static isConnectedToInternetViaWifi(): Promise<boolean> { return; }
+  isConnectedToInternetViaWifi(): Promise<boolean> { return; }
 
   /**
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  static isWifiOn(): Promise<boolean> { return; }
+  isWifiOn(): Promise<boolean> { return; }
 
   /**
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  static isWifiSupported(): Promise<boolean> { return; }
+  isWifiSupported(): Promise<boolean> { return; }
 
   /**
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  static isWifiDirectSupported(): Promise<boolean> { return; }
+  isWifiDirectSupported(): Promise<boolean> { return; }
 
   /**
    * @returns {Promise<Array<HotspotNetwork>>}
    */
   @Cordova()
-  static scanWifi(): Promise<Array<HotspotNetwork>> { return; }
+  scanWifi(): Promise<Array<HotspotNetwork>> { return; }
 
   /**
    * @returns {Promise<Array<HotspotNetwork>>}
    */
   @Cordova()
-  static scanWifiByLevel(): Promise<Array<HotspotNetwork>> { return; }
+  scanWifiByLevel(): Promise<Array<HotspotNetwork>> { return; }
 
   /**
    * @returns {Promise<any>}
    */
   @Cordova()
-  static startWifiPeriodicallyScan(interval: number, duration: number): Promise<any> { return; }
+  startWifiPeriodicallyScan(interval: number, duration: number): Promise<any> { return; }
 
   /**
    * @returns {Promise<any>}
    */
   @Cordova()
-  static stopWifiPeriodicallyScan(): Promise<any> { return; }
+  stopWifiPeriodicallyScan(): Promise<any> { return; }
 
   /**
    * @returns {Promise<HotspotNetworkConfig>}
    */
   @Cordova()
-  static getNetConfig(): Promise<HotspotNetworkConfig> { return; }
+  getNetConfig(): Promise<HotspotNetworkConfig> { return; }
 
   /**
    * @returns {Promise<HotspotConnectionInfo>}
    */
   @Cordova()
-  static getConnectionInfo(): Promise<HotspotConnectionInfo> { return; }
+  getConnectionInfo(): Promise<HotspotConnectionInfo> { return; }
 
   /**
    * @returns {Promise<string>}
    */
   @Cordova()
-  static pingHost(ip: string): Promise<string> { return; }
+  pingHost(ip: string): Promise<string> { return; }
 
   /**
    * Gets MAC Address associated with IP Address from ARP File
@@ -339,7 +339,7 @@ export class Hotspot {
    * @returns {Promise<string>}  - A Promise for the MAC Address
    */
   @Cordova()
-  static getMacAddressOfHost(ip: string): Promise<string> { return; }
+  getMacAddressOfHost(ip: string): Promise<string> { return; }
 
   /**
    * Checks if IP is live using DNS
@@ -349,7 +349,7 @@ export class Hotspot {
    * @returns {Promise<boolean>} - A Promise for whether the IP Address is reachable
    */
   @Cordova()
-  static isDnsLive(ip: string): Promise<boolean> { return; }
+  isDnsLive(ip: string): Promise<boolean> { return; }
 
   /**
    * Checks if IP is live using socket And PORT
@@ -359,7 +359,7 @@ export class Hotspot {
    * @returns {Promise<boolean>} - A Promise for whether the IP Address is reachable
    */
   @Cordova()
-  static isPortLive(ip: string): Promise<boolean> { return; }
+  isPortLive(ip: string): Promise<boolean> { return; }
 
   /**
    * Checks if device is rooted
@@ -367,6 +367,6 @@ export class Hotspot {
    * @returns {Promise<boolean>} - A Promise for whether the device is rooted
    */
   @Cordova()
-  static isRooted(): Promise<boolean> { return; }
+  isRooted(): Promise<boolean> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/http/index.ts b/src/@ionic-native/plugins/http/index.ts
index 910319fd6..645e87e0a 100644
--- a/src/@ionic-native/plugins/http/index.ts
+++ b/src/@ionic-native/plugins/http/index.ts
@@ -70,7 +70,7 @@ export class HTTP {
    * @returns {Object} an object representing a basic HTTP Authorization header of the form {'Authorization': 'Basic base64encodedusernameandpassword'}
    */
   @Cordova({ sync: true })
-  static getBasicAuthHeader(username: string, password: string): { Authorization: string; } { return; }
+  getBasicAuthHeader(username: string, password: string): { Authorization: string; } { return; }
 
   /**
    * This sets up all future requests to use Basic HTTP authentication with the given username and password.
@@ -78,7 +78,7 @@ export class HTTP {
    * @param password {string} Password
    */
   @Cordova({ sync: true })
-  static useBasicAuth(username: string, password: string): void { }
+  useBasicAuth(username: string, password: string): void { }
 
   /**
    * Set a header for all future requests. Takes a header and a value.
@@ -86,7 +86,7 @@ export class HTTP {
    * @param value {string} The value of the header
    */
   @Cordova({ sync: true })
-  static setHeader(header: string, value: string): void { }
+  setHeader(header: string, value: string): void { }
 
   /**
    * Enable or disable SSL Pinning. This defaults to false.
@@ -98,7 +98,7 @@ export class HTTP {
    * @returns {Promise<void>} returns a promise that will resolve on success, and reject on failure
    */
   @Cordova()
-  static enableSSLPinning(enable: boolean): Promise<void> { return; }
+  enableSSLPinning(enable: boolean): Promise<void> { return; }
 
   /**
    * Accept all SSL certificates. Or disabled accepting all certificates. Defaults to false.
@@ -106,7 +106,7 @@ export class HTTP {
    * @returns {Promise<void>} returns a promise that will resolve on success, and reject on failure
    */
   @Cordova()
-  static acceptAllCerts(accept: boolean): Promise<void> { return; }
+  acceptAllCerts(accept: boolean): Promise<void> { return; }
 
   /**
    * Whether or not to validate the domain name in the certificate. This defaults to true.
@@ -114,7 +114,7 @@ export class HTTP {
    * @returns {Promise<void>} returns a promise that will resolve on success, and reject on failure
    */
   @Cordova()
-  static validateDomainName(validate: boolean): Promise<void> { return; }
+  validateDomainName(validate: boolean): Promise<void> { return; }
 
   /**
    * Make a POST request
@@ -124,7 +124,7 @@ export class HTTP {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  static post(url: string, body: any, headers: any): Promise<HTTPResponse> { return; }
+  post(url: string, body: any, headers: any): Promise<HTTPResponse> { return; }
 
   /**
    *
@@ -134,7 +134,7 @@ export class HTTP {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  static get(url: string, parameters: any, headers: any): Promise<HTTPResponse> { return; }
+  get(url: string, parameters: any, headers: any): Promise<HTTPResponse> { return; }
 
   /**
    *
@@ -146,7 +146,7 @@ export class HTTP {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  static uploadFile(url: string, body: any, headers: any, filePath: string, name: string): Promise<HTTPResponse> { return; }
+  uploadFile(url: string, body: any, headers: any, filePath: string, name: string): Promise<HTTPResponse> { return; }
 
   /**
    *
@@ -157,5 +157,5 @@ export class HTTP {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  static downloadFile(url: string, body: any, headers: any, filePath: string): Promise<HTTPResponse> { return; }
+  downloadFile(url: string, body: any, headers: any, filePath: string): Promise<HTTPResponse> { return; }
 }
diff --git a/src/@ionic-native/plugins/httpd/index.ts b/src/@ionic-native/plugins/httpd/index.ts
index 4f7f8a980..9160a80e5 100644
--- a/src/@ionic-native/plugins/httpd/index.ts
+++ b/src/@ionic-native/plugins/httpd/index.ts
@@ -61,21 +61,21 @@ export class Httpd {
     observable: true,
     clearFunction: 'stopServer'
   })
-  static startServer(options?: HttpdOptions): Observable<string> { return; }
+  startServer(options?: HttpdOptions): Observable<string> { return; }
 
   /**
    * Gets the URL of the running server
    * @returns {Promise<string>} Returns a promise that resolves with the URL of the web server.
    */
   @Cordova()
-  static getUrl(): Promise<string> { return; }
+  getUrl(): Promise<string> { return; }
 
   /**
    * Get the local path of the running webserver
    * @returns {Promise<string>} Returns a promise that resolves with the local path of the web server.
     */
   @Cordova()
-  static getLocalPath(): Promise<string> { return; }
+  getLocalPath(): Promise<string> { return; }
 
 }
 
diff --git a/src/@ionic-native/plugins/ibeacon/index.ts b/src/@ionic-native/plugins/ibeacon/index.ts
index 018d071c8..26af8485f 100644
--- a/src/@ionic-native/plugins/ibeacon/index.ts
+++ b/src/@ionic-native/plugins/ibeacon/index.ts
@@ -290,7 +290,7 @@ export class IBeacon {
    *
    * @returns {IBeaconDelegate} An instance of the type {@type Delegate}.
    */
-  static Delegate(): IBeaconDelegate {
+  Delegate(): IBeaconDelegate {
     let delegate = new cordova.plugins.locationManager.Delegate();
 
     delegate.didChangeAuthorizationStatus = (pluginResult?: IBeaconPluginResult) => {
@@ -390,7 +390,7 @@ export class IBeacon {
    *
    * @returns {BeaconRegion} Returns the BeaconRegion that was created
    */
-  static BeaconRegion(identifer: string, uuid: string, major?: number, minor?: number, notifyEntryStateOnDisplay?: boolean): BeaconRegion {
+  BeaconRegion(identifer: string, uuid: string, major?: number, minor?: number, notifyEntryStateOnDisplay?: boolean): BeaconRegion {
     return new cordova.plugins.locationManager.BeaconRegion(identifer, uuid, major, minor, notifyEntryStateOnDisplay);
   }
 
@@ -398,7 +398,7 @@ export class IBeacon {
    * @returns {IBeaconDelegate} Returns the IBeaconDelegate
    */
   @Cordova()
-  static getDelegate(): IBeaconDelegate { return; }
+  getDelegate(): IBeaconDelegate { return; }
 
   /**
    * @param {IBeaconDelegate} delegate An instance of a delegate to register with the native layer.
@@ -406,7 +406,7 @@ export class IBeacon {
    * @returns {IBeaconDelegate} Returns the IBeaconDelegate
    */
   @Cordova()
-  static setDelegate(delegate: IBeaconDelegate): IBeaconDelegate { return; }
+  setDelegate(delegate: IBeaconDelegate): IBeaconDelegate { return; }
 
   /**
    * Signals the native layer that the client side is ready to consume messages.
@@ -429,7 +429,7 @@ export class IBeacon {
    * native layer acknowledged the request and started to send events.
    */
   @Cordova({otherPromise: true})
-  static onDomDelegateReady(): Promise<void> { return; }
+  onDomDelegateReady(): Promise<void> { return; }
 
   /**
    * Determines if bluetooth is switched on, according to the native layer.
@@ -437,7 +437,7 @@ export class IBeacon {
    * indicating whether bluetooth is active.
    */
   @Cordova({otherPromise: true})
-  static isBluetoothEnabled(): Promise<boolean> { return; }
+  isBluetoothEnabled(): Promise<boolean> { return; }
 
   /**
    * Enables Bluetooth using the native Layer. (ANDROID ONLY)
@@ -446,7 +446,7 @@ export class IBeacon {
    * could be enabled. If not, the promise will be rejected with an error.
    */
   @Cordova({otherPromise: true})
-  static enableBluetooth(): Promise<void> { return; }
+  enableBluetooth(): Promise<void> { return; }
 
   /**
    * Disables Bluetooth using the native Layer. (ANDROID ONLY)
@@ -455,7 +455,7 @@ export class IBeacon {
    * could be enabled. If not, the promise will be rejected with an error.
    */
   @Cordova({otherPromise: true})
-  static disableBluetooth(): Promise<void> { return; }
+  disableBluetooth(): Promise<void> { return; }
 
   /**
    * Start monitoring the specified region.
@@ -475,7 +475,7 @@ export class IBeacon {
    * native layer acknowledged the dispatch of the monitoring request.
    */
   @Cordova({otherPromise: true})
-  static startMonitoringForRegion(region: BeaconRegion): Promise<string> { return; }
+  startMonitoringForRegion(region: BeaconRegion): Promise<string> { return; }
 
   /**
    * Stop monitoring the specified region.  It is valid to call
@@ -492,7 +492,7 @@ export class IBeacon {
    * native layer acknowledged the dispatch of the request to stop monitoring.
    */
   @Cordova({otherPromise: true})
-  static stopMonitoringForRegion(region: BeaconRegion): Promise<void> { return; }
+  stopMonitoringForRegion(region: BeaconRegion): Promise<void> { return; }
 
   /**
    * Request state the for specified region. When result is ready
@@ -508,7 +508,7 @@ export class IBeacon {
    * native layer acknowledged the dispatch of the request to stop monitoring.
    */
   @Cordova({otherPromise: true})
-  static requestStateForRegion(region: Region): Promise<void> { return; }
+  requestStateForRegion(region: Region): Promise<void> { return; }
 
 
   /**
@@ -526,7 +526,7 @@ export class IBeacon {
    * native layer acknowledged the dispatch of the monitoring request.
    */
   @Cordova({otherPromise: true})
-  static startRangingBeaconsInRegion(region: BeaconRegion): Promise<void> { return; }
+  startRangingBeaconsInRegion(region: BeaconRegion): Promise<void> { return; }
 
   /**
    * Stop ranging the specified region.  It is valid to call
@@ -543,7 +543,7 @@ export class IBeacon {
    * native layer acknowledged the dispatch of the request to stop monitoring.
    */
   @Cordova({otherPromise: true})
-  static stopRangingBeaconsInRegion(region: BeaconRegion): Promise<void> { return; }
+  stopRangingBeaconsInRegion(region: BeaconRegion): Promise<void> { return; }
 
   /**
    * Queries the native layer to determine the current authorization in effect.
@@ -552,7 +552,7 @@ export class IBeacon {
    * requested authorization status.
    */
   @Cordova({otherPromise: true})
-  static getAuthorizationStatus(): Promise<any> { return; }
+  getAuthorizationStatus(): Promise<any> { return; }
 
   /**
    * For iOS 8 and above only. The permission model has changed by Apple in iOS 8, making it necessary for apps to
@@ -564,7 +564,7 @@ export class IBeacon {
    * @returns {Promise<void>} Returns a promise that is resolved when the request dialog is shown.
    */
   @Cordova({otherPromise: true})
-  static requestWhenInUseAuthorization(): Promise<void> { return; }
+  requestWhenInUseAuthorization(): Promise<void> { return; }
 
 
   /**
@@ -574,7 +574,7 @@ export class IBeacon {
    * shows the request dialog.
    */
   @Cordova({otherPromise: true})
-  static requestAlwaysAuthorization(): Promise<void> { return; }
+  requestAlwaysAuthorization(): Promise<void> { return; }
 
   /**
    *
@@ -582,7 +582,7 @@ export class IBeacon {
    * of {Region} instances that are being monitored by the native layer.
    */
   @Cordova({otherPromise: true})
-  static getMonitoredRegions(): Promise<Region[]> { return; }
+  getMonitoredRegions(): Promise<Region[]> { return; }
 
   /**
    *
@@ -590,7 +590,7 @@ export class IBeacon {
    * of {Region} instances that are being ranged by the native layer.
    */
   @Cordova({otherPromise: true})
-  static getRangedRegions(): Promise<Region[]> { return; }
+  getRangedRegions(): Promise<Region[]> { return; }
 
   /**
    * Determines if ranging is available or not, according to the native layer.
@@ -598,7 +598,7 @@ export class IBeacon {
    * indicating whether ranging is available or not.
    */
   @Cordova({otherPromise: true})
-  static isRangingAvailable(): Promise<boolean> { return; }
+  isRangingAvailable(): Promise<boolean> { return; }
 
   /**
    * Determines if region type is supported or not, according to the native layer.
@@ -610,7 +610,7 @@ export class IBeacon {
    * indicating whether the region type is supported or not.
    */
   @Cordova({otherPromise: true})
-  static isMonitoringAvailableForClass(region: Region): Promise<boolean> { return; }
+  isMonitoringAvailableForClass(region: Region): Promise<boolean> { return; }
 
   /**
    * Start advertising the specified region.
@@ -630,7 +630,7 @@ export class IBeacon {
    * native layer acknowledged the dispatch of the advertising request.
    */
   @Cordova({otherPromise: true})
-  static startAdvertising(region: Region, measuredPower: number): Promise<void> { return; }
+  startAdvertising(region: Region, measuredPower: number): Promise<void> { return; }
 
   /**
    * Stop advertising as a beacon.
@@ -641,7 +641,7 @@ export class IBeacon {
    * native layer acknowledged the dispatch of the request to stop advertising.
    */
   @Cordova({otherPromise: true})
-  static stopAdvertising(region: Region): Promise<void> { return; }
+  stopAdvertising(region: Region): Promise<void> { return; }
 
   /**
    * Determines if advertising is available or not, according to the native layer.
@@ -649,7 +649,7 @@ export class IBeacon {
    * indicating whether advertising is available or not.
    */
   @Cordova({otherPromise: true})
-  static isAdvertisingAvailable(): Promise<boolean> { return; }
+  isAdvertisingAvailable(): Promise<boolean> { return; }
 
   /**
    * Determines if advertising is currently active, according to the native layer.
@@ -657,7 +657,7 @@ export class IBeacon {
    * indicating whether advertising is active.
    */
   @Cordova({otherPromise: true})
-  static isAdvertising(): Promise<boolean> { return; }
+  isAdvertising(): Promise<boolean> { return; }
 
   /**
    * Disables debug logging in the native layer. Use this method if you want
@@ -667,7 +667,7 @@ export class IBeacon {
    * native layer has set the logging level accordingly.
    */
   @Cordova({otherPromise: true})
-  static disableDebugLogs(): Promise<void> { return; }
+  disableDebugLogs(): Promise<void> { return; }
 
   /**
    * Enables the posting of debug notifications in the native layer. Use this method if you want
@@ -678,7 +678,7 @@ export class IBeacon {
    * native layer has set the flag to enabled.
    */
   @Cordova({otherPromise: true})
-  static enableDebugNotifications(): Promise<void> { return; }
+  enableDebugNotifications(): Promise<void> { return; }
 
   /**
    * Disables the posting of debug notifications in the native layer. Use this method if you want
@@ -688,7 +688,7 @@ export class IBeacon {
    * native layer has set the flag to disabled.
    */
   @Cordova({otherPromise: true})
-  static disableDebugNotifications(): Promise<void> { return; }
+  disableDebugNotifications(): Promise<void> { return; }
 
   /**
    * Enables debug logging in the native layer. Use this method if you want
@@ -698,7 +698,7 @@ export class IBeacon {
    * native layer has set the logging level accordingly.
    */
   @Cordova({otherPromise: true})
-  static enableDebugLogs(): Promise<void> { return; }
+  enableDebugLogs(): Promise<void> { return; }
 
   /**
    * Appends the provided [message] to the device logs.
@@ -711,6 +711,6 @@ export class IBeacon {
    * is expected to be equivalent to the one provided in the original call.
    */
   @Cordova({otherPromise: true})
-  static appendToDeviceLog(message: string): Promise<void> { return; }
+  appendToDeviceLog(message: string): Promise<void> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/imagepicker/index.ts b/src/@ionic-native/plugins/imagepicker/index.ts
index a6ce489b4..45efb620a 100644
--- a/src/@ionic-native/plugins/imagepicker/index.ts
+++ b/src/@ionic-native/plugins/imagepicker/index.ts
@@ -63,7 +63,7 @@ export class ImagePicker {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static getPictures(options: ImagePickerOptions): Promise<any> { return; }
+  getPictures(options: ImagePickerOptions): Promise<any> { return; }
 
   /**
    * Check if we have permission to read images
@@ -72,7 +72,7 @@ export class ImagePicker {
   @Cordova({
     platforms: ['Android']
   })
-  static hasReadPermission(): Promise<boolean> { return; }
+  hasReadPermission(): Promise<boolean> { return; }
 
   /**
    * Request permission to read images
@@ -81,6 +81,6 @@ export class ImagePicker {
   @Cordova({
     platforms: ['Android']
   })
-  static requestReadPermission(): Promise<any> { return; }
+  requestReadPermission(): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/imageresizer/index.ts b/src/@ionic-native/plugins/imageresizer/index.ts
index 0dccd8755..f826fcb69 100644
--- a/src/@ionic-native/plugins/imageresizer/index.ts
+++ b/src/@ionic-native/plugins/imageresizer/index.ts
@@ -81,5 +81,5 @@ export class ImageResizer {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static resize(options: ImageResizerOptions): Promise<any> { return; }
+  resize(options: ImageResizerOptions): Promise<any> { return; }
 }
diff --git a/src/@ionic-native/plugins/inapppurchase/index.ts b/src/@ionic-native/plugins/inapppurchase/index.ts
index 2b4bb920e..1d1efd4f1 100644
--- a/src/@ionic-native/plugins/inapppurchase/index.ts
+++ b/src/@ionic-native/plugins/inapppurchase/index.ts
@@ -69,7 +69,7 @@ export class InAppPurchase {
   @Cordova({
     otherPromise: true
   })
-  static getProducts(productId: string[]): Promise<any> { return; }
+  getProducts(productId: string[]): Promise<any> { return; }
 
   /**
    * Buy a product that matches the productId.
@@ -79,7 +79,7 @@ export class InAppPurchase {
   @Cordova({
     otherPromise: true
   })
-  static buy(productId: string): Promise<{transactionId: string, receipt: string, signature: string, productType: string}> { return; }
+  buy(productId: string): Promise<{transactionId: string, receipt: string, signature: string, productType: string}> { return; }
 
   /**
    * Same as buy, but for subscription based products.
@@ -89,7 +89,7 @@ export class InAppPurchase {
   @Cordova({
     otherPromise: true
   })
-  static subscribe(productId: string): Promise<{transactionId: string, receipt: string, signature: string, productType: string}> { return; }
+  subscribe(productId: string): Promise<{transactionId: string, receipt: string, signature: string, productType: string}> { return; }
 
   /**
    * Call this function after purchasing a "consumable" product to mark it as consumed. On Android, you must consume products that you want to let the user purchase multiple times. If you will not consume the product after a purchase, the next time you will attempt to purchase it you will get the error message:
@@ -101,7 +101,7 @@ export class InAppPurchase {
   @Cordova({
     otherPromise: true
   })
-  static consume(productType: string, receipt: string, signature: string): Promise<any> { return; }
+  consume(productType: string, receipt: string, signature: string): Promise<any> { return; }
 
   /**
    * Restore all purchases from the store
@@ -110,7 +110,7 @@ export class InAppPurchase {
   @Cordova({
     otherPromise: true
   })
-  static restorePurchases(): Promise<any> { return; }
+  restorePurchases(): Promise<any> { return; }
 
   /**
    * Get the receipt.
@@ -120,6 +120,6 @@ export class InAppPurchase {
     otherPromise: true,
     platforms: ['iOS']
   })
-  static getReceipt(): Promise<string> { return; }
+  getReceipt(): Promise<string> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/insomnia/index.ts b/src/@ionic-native/plugins/insomnia/index.ts
index 71be3cd04..21404f4da 100644
--- a/src/@ionic-native/plugins/insomnia/index.ts
+++ b/src/@ionic-native/plugins/insomnia/index.ts
@@ -41,13 +41,13 @@ export class Insomnia {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static keepAwake(): Promise<any> { return; }
+  keepAwake(): Promise<any> { return; }
 
   /**
    * Allows the application to sleep again
    * @returns {Promise<any>}
    */
   @Cordova()
-  static allowSleepAgain(): Promise<any> { return; }
+  allowSleepAgain(): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/instagram/index.ts b/src/@ionic-native/plugins/instagram/index.ts
index 7caef2973..916ab1a43 100644
--- a/src/@ionic-native/plugins/instagram/index.ts
+++ b/src/@ionic-native/plugins/instagram/index.ts
@@ -32,7 +32,7 @@ export class Instagram {
   @Cordova({
     callbackStyle: 'node'
   })
-  static isInstalled(): Promise<boolean|string> { return; }
+  isInstalled(): Promise<boolean|string> { return; }
 
   /**
    * Share an image on Instagram
@@ -45,7 +45,7 @@ export class Instagram {
   @Cordova({
     callbackStyle: 'node'
   })
-  static share(canvasIdOrDataUrl: string, caption?: string): Promise<any> { return; }
+  share(canvasIdOrDataUrl: string, caption?: string): Promise<any> { return; }
 
   /**
    * Share a library asset or video
@@ -55,6 +55,6 @@ export class Instagram {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static shareAsset(assetLocalIdentifier: string): Promise<any> { return; }
+  shareAsset(assetLocalIdentifier: string): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/is-debug/index.ts b/src/@ionic-native/plugins/is-debug/index.ts
index 534ef631b..e54b274ff 100644
--- a/src/@ionic-native/plugins/is-debug/index.ts
+++ b/src/@ionic-native/plugins/is-debug/index.ts
@@ -31,7 +31,7 @@ export class IsDebug {
    * @returns {Promise<boolean>} Returns a promise that resolves with true if the app was installed via xcode / eclipse / the ionic CLI etc. It will resolve to false if the app was downloaded from the app / play store by the end user.
    */
   @Cordova()
-  static getIsDebug(): Promise<boolean> {
+  getIsDebug(): Promise<boolean> {
     return;
   }
 
diff --git a/src/@ionic-native/plugins/keyboard/index.ts b/src/@ionic-native/plugins/keyboard/index.ts
index 07cf2d649..b69a7fa86 100644
--- a/src/@ionic-native/plugins/keyboard/index.ts
+++ b/src/@ionic-native/plugins/keyboard/index.ts
@@ -28,7 +28,7 @@ export class Keyboard {
    * @param hide {boolean}
    */
    @Cordova({sync: true})
-  static hideKeyboardAccessoryBar(hide: boolean): void { }
+  hideKeyboardAccessoryBar(hide: boolean): void { }
 
   /**
    * Force keyboard to be shown.
@@ -37,7 +37,7 @@ export class Keyboard {
     sync: true,
     platforms: ['Android', 'BlackBerry 10', 'Windows']
   })
-  static show(): void { }
+  show(): void { }
 
   /**
    * Close the keyboard if open.
@@ -46,7 +46,7 @@ export class Keyboard {
     sync: true,
     platforms: ['iOS', 'Android', 'BlackBerry 10', 'Windows']
   })
-  static close(): void { }
+  close(): void { }
 
   /**
    * Prevents the native UIScrollView from moving when an input is focused.
@@ -56,7 +56,7 @@ export class Keyboard {
     sync: true,
     platforms: ['iOS', 'Windows']
   })
-  static disableScroll(disable: boolean): void { }
+  disableScroll(disable: boolean): void { }
 
   /**
    * Creates an observable that notifies you when the keyboard is shown. Unsubscribe to observable to cancel event watch.
@@ -67,7 +67,7 @@ export class Keyboard {
     event: 'native.keyboardshow',
     platforms: ['iOS', 'Android', 'BlackBerry 10', 'Windows']
   })
-  static onKeyboardShow(): Observable<any> { return; }
+  onKeyboardShow(): Observable<any> { return; }
 
   /**
    * Creates an observable that notifies you when the keyboard is hidden. Unsubscribe to observable to cancel event watch.
@@ -78,6 +78,6 @@ export class Keyboard {
     event: 'native.keyboardhide',
     platforms: ['iOS', 'Android', 'BlackBerry 10', 'Windows']
   })
-  static onKeyboardHide(): Observable<any> { return; }
+  onKeyboardHide(): Observable<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/launch-review/index.ts b/src/@ionic-native/plugins/launch-review/index.ts
index a946cff6a..b7d8445bd 100644
--- a/src/@ionic-native/plugins/launch-review/index.ts
+++ b/src/@ionic-native/plugins/launch-review/index.ts
@@ -33,6 +33,6 @@ export class LaunchReview {
    * @returns {Promise<void>}
    */
   @Cordova()
-  static launch(appId: string): Promise<void> { return; }
+  launch(appId: string): Promise<void> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/launchnavigator/index.ts b/src/@ionic-native/plugins/launchnavigator/index.ts
index 158989c35..3cb611d3d 100644
--- a/src/@ionic-native/plugins/launchnavigator/index.ts
+++ b/src/@ionic-native/plugins/launchnavigator/index.ts
@@ -102,7 +102,7 @@ export class LaunchNavigator {
     successIndex: 1,
     errorIndex: 2
   })
-  static navigate(
+  navigate(
     destination: string | number[],
     options?: LaunchNavigatorOptions
     ): Promise<any> { return; }
@@ -113,14 +113,14 @@ export class LaunchNavigator {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static isAppAvailable(app: string): Promise<any> { return; }
+  isAppAvailable(app: string): Promise<any> { return; }
 
   /**
    * Returns a list indicating which apps are installed and available on the current device.
    * @returns {Promise<string[]>}
    */
   @Cordova()
-  static availableApps(): Promise<string[]> { return; }
+  availableApps(): Promise<string[]> { return; }
 
   /**
    * Returns the display name of the specified app.
@@ -128,7 +128,7 @@ export class LaunchNavigator {
    * @returns {string}
    */
   @Cordova({ sync: true })
-  static getAppDisplayName(app: string): string { return; }
+  getAppDisplayName(app: string): string { return; }
 
   /**
    * Returns list of supported apps on a given platform.
@@ -136,7 +136,7 @@ export class LaunchNavigator {
    * @returns {string[]}
    */
   @Cordova({ sync: true })
-  static getAppsForPlatform(platform: string): string[] { return; }
+  getAppsForPlatform(platform: string): string[] { return; }
 
   /**
    * Indicates if an app on a given platform supports specification of transport mode.
@@ -145,7 +145,7 @@ export class LaunchNavigator {
    * @returns {boolean}
    */
   @Cordova({ sync: true })
-  static supportsTransportMode(app: string, platform: string): boolean { return; }
+  supportsTransportMode(app: string, platform: string): boolean { return; }
 
   /**
    * Returns the list of transport modes supported by an app on a given platform.
@@ -154,7 +154,7 @@ export class LaunchNavigator {
    * @returns {string[]}
    */
   @Cordova({ sync: true })
-  static getTransportModes(app: string, platform: string): string[] { return; }
+  getTransportModes(app: string, platform: string): string[] { return; }
 
   /**
    * Indicates if an app on a given platform supports specification of launch mode.
@@ -164,7 +164,7 @@ export class LaunchNavigator {
    * @returns {boolean}
    */
   @Cordova({ sync: true })
-  static supportsLaunchMode(app: string, platform: string): boolean { return; }
+  supportsLaunchMode(app: string, platform: string): boolean { return; }
 
   /**
    * Indicates if an app on a given platform supports specification of start location.
@@ -173,7 +173,7 @@ export class LaunchNavigator {
    * @returns {boolean}
    */
   @Cordova({ sync: true })
-  static supportsStart(app: string, platform: string): boolean { return; }
+  supportsStart(app: string, platform: string): boolean { return; }
 
   /**
    * @param app {string}
@@ -181,7 +181,7 @@ export class LaunchNavigator {
    * @returns {boolean}
    */
   @Cordova({ sync: true })
-  static supportsStartName(app: string, platform: string): boolean { return; }
+  supportsStartName(app: string, platform: string): boolean { return; }
 
   /**
    * @param app {string}
@@ -189,14 +189,14 @@ export class LaunchNavigator {
    * @returns {boolean}
    */
   @Cordova({ sync: true })
-  static supportsDestName(app: string, platform: string): boolean { return; }
+  supportsDestName(app: string, platform: string): boolean { return; }
 
   /**
    * @param destination {string | number[]}
    * @param options {LaunchNavigatorOptions}
    */
   @Cordova({ sync: true })
-  static userSelect(destination: string | number[], options: LaunchNavigatorOptions): void { }
+  userSelect(destination: string | number[], options: LaunchNavigatorOptions): void { }
 
   static APP: any = {
     USER_SELECT: 'user_select',
diff --git a/src/@ionic-native/plugins/localnotifications/index.ts b/src/@ionic-native/plugins/localnotifications/index.ts
index a6f4c4e66..dd1d4aba0 100644
--- a/src/@ionic-native/plugins/localnotifications/index.ts
+++ b/src/@ionic-native/plugins/localnotifications/index.ts
@@ -144,7 +144,7 @@ export class LocalNotifications {
   @Cordova({
     sync: true
   })
-  static schedule(options?: ILocalNotification | Array<ILocalNotification>): void { }
+  schedule(options?: ILocalNotification | Array<ILocalNotification>): void { }
 
   /**
    * Updates a previously scheduled notification. Must include the id in the options parameter.
@@ -153,7 +153,7 @@ export class LocalNotifications {
   @Cordova({
     sync: true
   })
-  static update(options?: ILocalNotification): void { }
+  update(options?: ILocalNotification): void { }
 
   /**
    * Clears single or multiple notifications
@@ -161,7 +161,7 @@ export class LocalNotifications {
    * @returns {Promise<any>} Returns a promise when the notification had been cleared
    */
   @Cordova()
-  static clear(notificationId: any): Promise<any> { return; }
+  clear(notificationId: any): Promise<any> { return; }
 
   /**
    * Clears all notifications
@@ -171,7 +171,7 @@ export class LocalNotifications {
     successIndex: 0,
     errorIndex: 2
   })
-  static clearAll(): Promise<any> { return; }
+  clearAll(): Promise<any> { return; }
 
   /**
    * Cancels single or multiple notifications
@@ -179,7 +179,7 @@ export class LocalNotifications {
    * @returns {Promise<any>} Returns a promise when the notification is canceled
    */
   @Cordova()
-  static cancel(notificationId: any): Promise<any> { return; }
+  cancel(notificationId: any): Promise<any> { return; }
 
   /**
    * Cancels all notifications
@@ -189,7 +189,7 @@ export class LocalNotifications {
     successIndex: 0,
     errorIndex: 2
   })
-  static cancelAll(): Promise<any> { return; }
+  cancelAll(): Promise<any> { return; }
 
   /**
    * Checks presence of a notification
@@ -197,7 +197,7 @@ export class LocalNotifications {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  static isPresent(notificationId: number): Promise<boolean> { return; }
+  isPresent(notificationId: number): Promise<boolean> { return; }
 
   /**
    * Checks is a notification is scheduled
@@ -205,7 +205,7 @@ export class LocalNotifications {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  static isScheduled(notificationId: number): Promise<boolean> { return; }
+  isScheduled(notificationId: number): Promise<boolean> { return; }
 
   /**
    * Checks if a notification is triggered
@@ -213,28 +213,28 @@ export class LocalNotifications {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  static isTriggered(notificationId: number): Promise<boolean> { return; }
+  isTriggered(notificationId: number): Promise<boolean> { return; }
 
   /**
    * Get all the notification ids
    * @returns {Promise<Array<number>>}
    */
   @Cordova()
-  static getAllIds(): Promise<Array<number>> { return; }
+  getAllIds(): Promise<Array<number>> { return; }
 
   /**
    * Get the ids of triggered notifications
    * @returns {Promise<Array<number>>}
    */
   @Cordova()
-  static getTriggeredIds(): Promise<Array<number>> { return; }
+  getTriggeredIds(): Promise<Array<number>> { return; }
 
   /**
    * Get the ids of scheduled notifications
    * @returns {Promise<Array<number>>} Returns a promise
    */
   @Cordova()
-  static getScheduledIds(): Promise<Array<number>> { return; }
+  getScheduledIds(): Promise<Array<number>> { return; }
 
   /**
    * Get a notification object
@@ -242,7 +242,7 @@ export class LocalNotifications {
    * @returns {Promise<ILocalNotification>}
    */
   @Cordova()
-  static get(notificationId: any): Promise<ILocalNotification> { return; }
+  get(notificationId: any): Promise<ILocalNotification> { return; }
 
   /**
    * Get a scheduled notification object
@@ -250,7 +250,7 @@ export class LocalNotifications {
    * @returns {Promise<ILocalNotification>}
    */
   @Cordova()
-  static getScheduled(notificationId: any): Promise<ILocalNotification> { return; }
+  getScheduled(notificationId: any): Promise<ILocalNotification> { return; }
 
   /**
    * Get a triggered notification object
@@ -258,42 +258,42 @@ export class LocalNotifications {
    * @returns {Promise<ILocalNotification>}
    */
   @Cordova()
-  static getTriggered(notificationId: any): Promise<ILocalNotification> { return; }
+  getTriggered(notificationId: any): Promise<ILocalNotification> { return; }
 
   /**
    * Get all notification objects
    * @returns {Promise<Array<ILocalNotification>>}
    */
   @Cordova()
-  static getAll(): Promise<Array<ILocalNotification>> { return; }
+  getAll(): Promise<Array<ILocalNotification>> { return; }
 
   /**
    * Get all scheduled notification objects
    * @returns {Promise<Array<ILocalNotification>>}
    */
   @Cordova()
-  static getAllScheduled(): Promise<Array<ILocalNotification>> { return; }
+  getAllScheduled(): Promise<Array<ILocalNotification>> { return; }
 
   /**
    * Get all triggered notification objects
    * @returns {Promise<Array<ILocalNotification>>}
    */
   @Cordova()
-  static getAllTriggered(): Promise<Array<ILocalNotification>> { return; }
+  getAllTriggered(): Promise<Array<ILocalNotification>> { return; }
 
   /**
    * Register permission to show notifications if not already granted.
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  static registerPermission(): Promise<boolean> { return; }
+  registerPermission(): Promise<boolean> { return; }
 
   /**
    * Informs if the app has the permission to show notifications.
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  static hasPermission(): Promise<boolean> { return; }
+  hasPermission(): Promise<boolean> { return; }
 
 
   /**
@@ -304,7 +304,7 @@ export class LocalNotifications {
   @Cordova({
     sync: true
   })
-  static on(eventName: string, callback: any): void { }
+  on(eventName: string, callback: any): void { }
 
 
 }
diff --git a/src/@ionic-native/plugins/location-accuracy/index.ts b/src/@ionic-native/plugins/location-accuracy/index.ts
index a49cc4503..3dba76fd0 100644
--- a/src/@ionic-native/plugins/location-accuracy/index.ts
+++ b/src/@ionic-native/plugins/location-accuracy/index.ts
@@ -36,14 +36,14 @@ export class LocationAccuracy {
    * @returns {Promise<boolean>} Returns a promise that resovles with a boolean that indicates if you can request accurate location
    */
   @Cordova()
-  static canRequest(): Promise<boolean> { return; }
+  canRequest(): Promise<boolean> { return; }
 
   /**
    * Indicates if a request is currently in progress
    * @returns {Promise<boolean>} Returns a promise that resolves with a boolean that indicates if a request is currently in progress
    */
   @Cordova()
-  static isRequesting(): Promise<boolean> { return; }
+  isRequesting(): Promise<boolean> { return; }
 
   /**
    * Requests accurate location
@@ -51,7 +51,7 @@ export class LocationAccuracy {
    * @returns {Promise<any>} Returns a promise that resolves on success and rejects if an error occurred
    */
   @Cordova({ callbackOrder: 'reverse' })
-  static request(accuracy: number): Promise<any> { return; }
+  request(accuracy: number): Promise<any> { return; }
 
   static REQUEST_PRIORITY_NO_POWER = 0;
   static REQUEST_PRIORITY_LOW_POWER = 1;
diff --git a/src/@ionic-native/plugins/market/index.ts b/src/@ionic-native/plugins/market/index.ts
index c480222e5..b2e0b2952 100644
--- a/src/@ionic-native/plugins/market/index.ts
+++ b/src/@ionic-native/plugins/market/index.ts
@@ -32,7 +32,7 @@ export class Market {
     successName: 'success',
     errorName: 'failure'
   })
-  static open(appId: string): Promise<any> { return; }
+  open(appId: string): Promise<any> { return; }
 
   /**
    * Search apps by keyword
@@ -45,6 +45,6 @@ export class Market {
     errorName: 'failure',
     platforms: ['Android']
   })
-  static search(keyword: string): Promise<any> { return; }
+  search(keyword: string): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/media-capture/index.ts b/src/@ionic-native/plugins/media-capture/index.ts
index 4474309bb..c5589febf 100644
--- a/src/@ionic-native/plugins/media-capture/index.ts
+++ b/src/@ionic-native/plugins/media-capture/index.ts
@@ -171,7 +171,7 @@ export class MediaCapture {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static captureAudio(options?: CaptureAudioOptions): Promise<MediaFile[] | CaptureError> { return; }
+  captureAudio(options?: CaptureAudioOptions): Promise<MediaFile[] | CaptureError> { return; }
 
   /**
    * Start the camera application and return information about captured image files.
@@ -181,7 +181,7 @@ export class MediaCapture {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static captureImage(options?: CaptureImageOptions): Promise<MediaFile[] | CaptureError> { return; }
+  captureImage(options?: CaptureImageOptions): Promise<MediaFile[] | CaptureError> { return; }
 
   /**
    * Start the video recorder application and return information about captured video clip files.
@@ -191,7 +191,7 @@ export class MediaCapture {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static captureVideo(options?: CaptureVideoOptions): Promise<MediaFile[] | CaptureError> { return; }
+  captureVideo(options?: CaptureVideoOptions): Promise<MediaFile[] | CaptureError> { return; }
 
   /**
    * is fired if the capture call is successful
@@ -201,7 +201,7 @@ export class MediaCapture {
     eventObservable: true,
     event: 'pendingcaptureresult'
   })
-  static onPendingCaptureResult(): Observable<MediaFile[]> { return; }
+  onPendingCaptureResult(): Observable<MediaFile[]> { return; }
 
   /**
    * is fired if the capture call is unsuccessful
@@ -211,6 +211,6 @@ export class MediaCapture {
     eventObservable: true,
     event: 'pendingcaptureerror'
   })
-  static onPendingCaptureError(): Observable<CaptureError> { return; }
+  onPendingCaptureError(): Observable<CaptureError> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/mixpanel/index.ts b/src/@ionic-native/plugins/mixpanel/index.ts
index d98655872..4acbd6a72 100644
--- a/src/@ionic-native/plugins/mixpanel/index.ts
+++ b/src/@ionic-native/plugins/mixpanel/index.ts
@@ -35,20 +35,20 @@ export class Mixpanel {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static alias(aliasId: string, originalId: string): Promise<any> { return; }
+  alias(aliasId: string, originalId: string): Promise<any> { return; }
 
   /**
    *
    * @returns {Promise<any>}
    */
   @Cordova()
-  static distinctId(): Promise<any> { return; }
+  distinctId(): Promise<any> { return; }
 
   /**
    * @returns {Promise<any>}
    */
   @Cordova()
-  static flush(): Promise<any> { return; }
+  flush(): Promise<any> { return; }
 
   /**
    *
@@ -56,7 +56,7 @@ export class Mixpanel {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static identify(distinctId: string): Promise<any> { return; }
+  identify(distinctId: string): Promise<any> { return; }
 
   /**
    *
@@ -64,7 +64,7 @@ export class Mixpanel {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static init(token: string): Promise<any> { return; }
+  init(token: string): Promise<any> { return; }
 
   /**
    *
@@ -72,14 +72,14 @@ export class Mixpanel {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static registerSuperProperties(superProperties: any): Promise<any> { return; }
+  registerSuperProperties(superProperties: any): Promise<any> { return; }
 
   /**
    *
    * @returns {Promise<any>}
    */
   @Cordova()
-  static reset(): Promise<any> { return; }
+  reset(): Promise<any> { return; }
 
   /**
    *
@@ -91,14 +91,14 @@ export class Mixpanel {
     successIndex: 2,
     errorIndex: 3
   })
-  static track(eventName: string, eventProperties?: any): Promise<any> { return; }
+  track(eventName: string, eventProperties?: any): Promise<any> { return; }
 
   /**
    *
    * @returns {Promise<any>}
    */
   @Cordova()
-  static showSurvey(): Promise<any> { return; }
+  showSurvey(): Promise<any> { return; }
 
   /**
    *
@@ -129,7 +129,7 @@ export class MixpanelPeople {
    * @return {Promise<any>}
    */
   @Cordova()
-  static identify(distinctId: string): Promise<any> { return; }
+  identify(distinctId: string): Promise<any> { return; }
 
   /**
    *
@@ -137,7 +137,7 @@ export class MixpanelPeople {
    * @return {Promise<any>}
    */
   @Cordova()
-  static increment(peopleProperties: any): Promise<any> { return; }
+  increment(peopleProperties: any): Promise<any> { return; }
 
   /**
    *
@@ -145,7 +145,7 @@ export class MixpanelPeople {
    * @return {Promise<any>}
    */
   @Cordova()
-  static setPushId(pushId: string): Promise<any> { return; }
+  setPushId(pushId: string): Promise<any> { return; }
 
   /**
    *
@@ -153,7 +153,7 @@ export class MixpanelPeople {
    * @return {Promise<any>}
    */
   @Cordova()
-  static set(peopleProperties: any): Promise<any> { return; }
+  set(peopleProperties: any): Promise<any> { return; }
 
   /**
    *
@@ -161,5 +161,5 @@ export class MixpanelPeople {
    * @return {Promise<any>}
    */
   @Cordova()
-  static setOnce(peopleProperties: any): Promise<any> { return; }
+  setOnce(peopleProperties: any): Promise<any> { return; }
 }
diff --git a/src/@ionic-native/plugins/music-controls/index.ts b/src/@ionic-native/plugins/music-controls/index.ts
index 89a0faed2..82f4bc56d 100644
--- a/src/@ionic-native/plugins/music-controls/index.ts
+++ b/src/@ionic-native/plugins/music-controls/index.ts
@@ -103,14 +103,14 @@ export class MusicControls {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static create(options: MusicControlsOptions): Promise<any> {return; }
+  create(options: MusicControlsOptions): Promise<any> {return; }
 
   /**
    * Destroy the media controller
    * @returns {Promise<any>}
    */
   @Cordova()
-  static destroy(): Promise<any> {return; }
+  destroy(): Promise<any> {return; }
 
   /**
    * Subscribe to the events of the media controller
@@ -119,19 +119,19 @@ export class MusicControls {
   @Cordova({
     observable: true
   })
-  static subscribe(): Observable<any> {return; }
+  subscribe(): Observable<any> {return; }
 
   /**
    * Start listening for events, this enables the Observable from the subscribe method
    */
   @Cordova({sync: true})
-  static listen(): void {}
+  listen(): void {}
 
   /**
    * Toggle play/pause:
    * @param isPlaying {boolean}
    */
   @Cordova({sync: true})
-  static updateIsPlaying(isPlaying: boolean): void {}
+  updateIsPlaying(isPlaying: boolean): void {}
 
 }
diff --git a/src/@ionic-native/plugins/native-audio/index.ts b/src/@ionic-native/plugins/native-audio/index.ts
index 2c05f6881..d2a44fd02 100644
--- a/src/@ionic-native/plugins/native-audio/index.ts
+++ b/src/@ionic-native/plugins/native-audio/index.ts
@@ -40,7 +40,7 @@ export class NativeAudio {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static preloadSimple(id: string, assetPath: string): Promise<any> {return; }
+  preloadSimple(id: string, assetPath: string): Promise<any> {return; }
 
   /**
    * Loads an audio file into memory. Optimized for background music / ambient sound. Uses highlevel native APIs with a larger footprint. (iOS: AVAudioPlayer). Can be stopped / looped and used with multiple voices. Can be faded in and out using the delay parameter.
@@ -52,7 +52,7 @@ export class NativeAudio {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static preloadComplex(id: string, assetPath: string, volume: number, voices: number, delay: number): Promise<any> {return; }
+  preloadComplex(id: string, assetPath: string, volume: number, voices: number, delay: number): Promise<any> {return; }
 
   /**
    * Plays an audio asset
@@ -64,7 +64,7 @@ export class NativeAudio {
     successIndex: 1,
     errorIndex: 2
   })
-  static play(id: string, completeCallback?: Function): Promise<any> {return; }
+  play(id: string, completeCallback?: Function): Promise<any> {return; }
 
   /**
    * Stops playing an audio
@@ -72,7 +72,7 @@ export class NativeAudio {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static stop(id: string): Promise<any> {return; }
+  stop(id: string): Promise<any> {return; }
 
   /**
    * Loops an audio asset infinitely, this only works for complex assets
@@ -80,7 +80,7 @@ export class NativeAudio {
    * @return {Promise<any>}
    */
   @Cordova()
-  static loop(id: string): Promise<any> {return; }
+  loop(id: string): Promise<any> {return; }
 
   /**
    * Unloads an audio file from memory
@@ -88,7 +88,7 @@ export class NativeAudio {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static unload(id: string): Promise<any> {return; }
+  unload(id: string): Promise<any> {return; }
 
   /**
    * Changes the volume for preloaded complex assets.
@@ -97,6 +97,6 @@ export class NativeAudio {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static setVolumeForComplexAsset(id: string, volume: number): Promise<any> {return; }
+  setVolumeForComplexAsset(id: string, volume: number): Promise<any> {return; }
 
 }
diff --git a/src/@ionic-native/plugins/native-geocoder/index.ts b/src/@ionic-native/plugins/native-geocoder/index.ts
index f13b03208..b29647936 100644
--- a/src/@ionic-native/plugins/native-geocoder/index.ts
+++ b/src/@ionic-native/plugins/native-geocoder/index.ts
@@ -42,7 +42,7 @@ export class NativeGeocoder {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static reverseGeocode(latitude: number, longitude: number): Promise<NativeGeocoderReverseResult> { return; }
+  reverseGeocode(latitude: number, longitude: number): Promise<NativeGeocoderReverseResult> { return; }
 
   /**
    * Forward geocode a given address to find coordinates
@@ -52,7 +52,7 @@ export class NativeGeocoder {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static forwardGeocode(addressString: string): Promise<NativeGeocoderForwardResult> { return; }
+  forwardGeocode(addressString: string): Promise<NativeGeocoderForwardResult> { return; }
 
 }
 
diff --git a/src/@ionic-native/plugins/native-page-transitions/index.ts b/src/@ionic-native/plugins/native-page-transitions/index.ts
index c99977444..49ac4146c 100644
--- a/src/@ionic-native/plugins/native-page-transitions/index.ts
+++ b/src/@ionic-native/plugins/native-page-transitions/index.ts
@@ -58,7 +58,7 @@ export class NativePageTransitions {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static slide(options: NativeTransitionOptions): Promise<any> { return; }
+  slide(options: NativeTransitionOptions): Promise<any> { return; }
 
   /**
    * Perform a flip animation
@@ -66,7 +66,7 @@ export class NativePageTransitions {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static flip(options: NativeTransitionOptions): Promise<any> { return; }
+  flip(options: NativeTransitionOptions): Promise<any> { return; }
 
   /**
    * Perform a fade animation
@@ -74,7 +74,7 @@ export class NativePageTransitions {
    * @returns {Promise<any>}
    */
   @Cordova({platforms: ['iOS', 'Android']})
-  static fade(options: NativeTransitionOptions): Promise<any> { return; }
+  fade(options: NativeTransitionOptions): Promise<any> { return; }
 
 
   /**
@@ -83,7 +83,7 @@ export class NativePageTransitions {
    * @returns {Promise<any>}
    */
   @Cordova({platforms: ['iOS', 'Android']})
-  static drawer(options: NativeTransitionOptions): Promise<any> { return; }
+  drawer(options: NativeTransitionOptions): Promise<any> { return; }
 
 
 
@@ -93,7 +93,7 @@ export class NativePageTransitions {
    * @returns {Promise<any>}
    */
   @Cordova({platforms: ['iOS']})
-  static curl(options: NativeTransitionOptions): Promise<any> { return; }
+  curl(options: NativeTransitionOptions): Promise<any> { return; }
 
 }
 
diff --git a/src/@ionic-native/plugins/nativestorage/index.ts b/src/@ionic-native/plugins/nativestorage/index.ts
index b2f44eb06..a15af0908 100644
--- a/src/@ionic-native/plugins/nativestorage/index.ts
+++ b/src/@ionic-native/plugins/nativestorage/index.ts
@@ -38,7 +38,7 @@ export class NativeStorage {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static setItem(reference: string, value: any): Promise<any> {return; }
+  setItem(reference: string, value: any): Promise<any> {return; }
 
   /**
    * Gets a stored item
@@ -46,7 +46,7 @@ export class NativeStorage {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static getItem(reference: string): Promise<any> {return; }
+  getItem(reference: string): Promise<any> {return; }
 
   /**
    * Removes a single stored item
@@ -54,13 +54,13 @@ export class NativeStorage {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static remove(reference: string): Promise<any> {return; }
+  remove(reference: string): Promise<any> {return; }
 
   /**
    * Removes all stored values.
    * @returns {Promise<any>}
    */
   @Cordova()
-  static clear(): Promise<any> {return; }
+  clear(): Promise<any> {return; }
 
 }
diff --git a/src/@ionic-native/plugins/navigationbar/index.ts b/src/@ionic-native/plugins/navigationbar/index.ts
index cfda5ba06..217019d52 100644
--- a/src/@ionic-native/plugins/navigationbar/index.ts
+++ b/src/@ionic-native/plugins/navigationbar/index.ts
@@ -36,7 +36,7 @@ export class NavigationBar {
     successName: 'success',
     errorName: 'failure'
   })
-  static setUp(autohide?: boolean): Promise<any> { return; }
+  setUp(autohide?: boolean): Promise<any> { return; }
 
   /**
    * Hide the navigation bar. 
@@ -47,6 +47,6 @@ export class NavigationBar {
     successName: 'success',
     errorName: 'failure'
   })
-  static hideNavigationBar(): Promise<any> { return; }
+  hideNavigationBar(): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/network/index.ts b/src/@ionic-native/plugins/network/index.ts
index fddd2fd35..967f00617 100644
--- a/src/@ionic-native/plugins/network/index.ts
+++ b/src/@ionic-native/plugins/network/index.ts
@@ -72,14 +72,14 @@ export class Network {
    * @return {Observable<any>}
    */
   @CordovaFunctionOverride()
-  static onchange(): Observable<any> { return; }
+  onchange(): Observable<any> { return; }
 
   /**
    * Returns an observable to watch connection type changes
    * @return {Observable<any>}
    */
   @CordovaFunctionOverride()
-  static ontypechange(): Observable<any> { return; }
+  ontypechange(): Observable<any> { return; }
 
   /**
    * Get notified when the device goes offline
@@ -89,7 +89,7 @@ export class Network {
     eventObservable: true,
     event: 'offline'
   })
-  static onDisconnect(): Observable<any> { return; }
+  onDisconnect(): Observable<any> { return; }
 
   /**
    * Get notified when the device goes online
@@ -99,6 +99,6 @@ export class Network {
     eventObservable: true,
     event: 'online'
   })
-  static onConnect(): Observable<any> { return; }
+  onConnect(): Observable<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/nfc/index.ts b/src/@ionic-native/plugins/nfc/index.ts
index ac4d161f8..ca48d201b 100644
--- a/src/@ionic-native/plugins/nfc/index.ts
+++ b/src/@ionic-native/plugins/nfc/index.ts
@@ -45,7 +45,7 @@ export class NFC {
     clearFunction: 'removeNdefListener',
     clearWithArgs: true
   })
-  static addNdefListener(onSuccess?: Function, onFailure?: Function): Observable<any> {return; }
+  addNdefListener(onSuccess?: Function, onFailure?: Function): Observable<any> {return; }
 
   /**
    * Registers an event listener for tags matching any tag type.
@@ -60,7 +60,7 @@ export class NFC {
     clearFunction: 'removeTagDiscoveredListener',
     clearWithArgs: true
   })
-  static addTagDiscoveredListener(onSuccess?: Function, onFailure?: Function): Observable<any> {return; }
+  addTagDiscoveredListener(onSuccess?: Function, onFailure?: Function): Observable<any> {return; }
 
   /**
    * Registers an event listener for NDEF tags matching a specified MIME type.
@@ -76,7 +76,7 @@ export class NFC {
     clearFunction: 'removeMimeTypeListener',
     clearWithArgs: true
   })
-  static addMimeTypeListener(mimeType: string, onSuccess?: Function, onFailure?: Function): Observable<any> {return; }
+  addMimeTypeListener(mimeType: string, onSuccess?: Function, onFailure?: Function): Observable<any> {return; }
 
   /**
    * Registers an event listener for formatable NDEF tags.
@@ -89,7 +89,7 @@ export class NFC {
     successIndex: 0,
     errorIndex: 3
   })
-  static addNdefFormatableListener(onSuccess?: Function, onFailure?: Function): Observable<any> {return; }
+  addNdefFormatableListener(onSuccess?: Function, onFailure?: Function): Observable<any> {return; }
 
   /**
    * Qrites an NdefMessage to a NFC tag.
@@ -97,13 +97,13 @@ export class NFC {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static write(message: any[]): Promise<any> {return; }
+  write(message: any[]): Promise<any> {return; }
   /**
    * Makes a NFC tag read only. **Warning** this is permanent.
    * @returns {Promise<any>}
    */
   @Cordova()
-  static makeReadyOnly(): Promise<any> {return; }
+  makeReadyOnly(): Promise<any> {return; }
 
   /**
    * Shares an NDEF Message via peer-to-peer.
@@ -111,20 +111,20 @@ export class NFC {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static share(message: any[]): Promise<any> {return; }
+  share(message: any[]): Promise<any> {return; }
 
   /**
    * Stop sharing NDEF data via peer-to-peer.
    * @returns {Promise<any>}
    */
   @Cordova()
-  static unshare(): Promise<any> {return; }
+  unshare(): Promise<any> {return; }
 
   /**
    * Erase a NDEF tag
    */
   @Cordova()
-  static erase(): Promise<any> {return; }
+  erase(): Promise<any> {return; }
 
   /**
    * Send a file to another device via NFC handover.
@@ -132,49 +132,49 @@ export class NFC {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static handover(uris: string[]): Promise<any> {return; }
+  handover(uris: string[]): Promise<any> {return; }
 
   /**
    * Stop sharing NDEF data via NFC handover.
    * @returns {Promise<any>}
    */
   @Cordova()
-  static stopHandover(): Promise<any> {return; }
+  stopHandover(): Promise<any> {return; }
 
   /**
    * Show the NFC settings on the device.
    * @returns {Promise<any>}
    */
   @Cordova()
-  static showSettings(): Promise<any> {return; }
+  showSettings(): Promise<any> {return; }
 
   /**
    * Check if NFC is available and enabled on this device.
    * @returns {Promise<any>}
    */
   @Cordova()
-  static enabled(): Promise<any> {return; }
+  enabled(): Promise<any> {return; }
   /**
    * Convert bytes to string
    * @param bytes {number[]}
    * @returns {string}
    */
   @Cordova({ sync: true })
-  static bytesToString(bytes: number[]): string {return; }
+  bytesToString(bytes: number[]): string {return; }
   /**
    * Convert string to bytes
    * @param str {string}
    * @returns {number[]}
    */
   @Cordova({ sync: true })
-  static stringToBytes(str: string): number[] {return; };
+  stringToBytes(str: string): number[] {return; };
   /**
    * Convert bytes to hex string
    * @param bytes {number[]}
    * @returns {string}
    */
   @Cordova({ sync: true })
-  static bytesToHexString(bytes: number[]): string {return; };
+  bytesToHexString(bytes: number[]): string {return; };
 
 }
 /**
@@ -196,14 +196,14 @@ export class Ndef {
   static pluginRef = 'ndef';
 
   @Cordova({ sync: true })
-  static uriRecord(uri: string): any { return; }
+  uriRecord(uri: string): any { return; }
 
   @Cordova({ sync: true })
-  static textRecord(text: string): any { return; }
+  textRecord(text: string): any { return; }
 
   @Cordova({ sync: true })
-  static mimeMediaRecord(mimeType: string, payload: string): any { return; }
+  mimeMediaRecord(mimeType: string, payload: string): any { return; }
 
   @Cordova({ sync: true })
-  static androidApplicationRecord(packageName: string): any { return; }
+  androidApplicationRecord(packageName: string): any { return; }
 }
diff --git a/src/@ionic-native/plugins/onesignal/index.ts b/src/@ionic-native/plugins/onesignal/index.ts
index d85ce0024..c6411be9b 100644
--- a/src/@ionic-native/plugins/onesignal/index.ts
+++ b/src/@ionic-native/plugins/onesignal/index.ts
@@ -323,7 +323,7 @@ export class OneSignal {
    * @returns {any}
    */
   @Cordova({ sync: true })
-  static startInit(appId: string, googleProjectNumber?: string): any { return; }
+  startInit(appId: string, googleProjectNumber?: string): any { return; }
 
   /**
    * Callback to run when a notification is received, whether it was displayed or not.
@@ -333,7 +333,7 @@ export class OneSignal {
   @Cordova({
     observable: true
   })
-  static handleNotificationReceived(): Observable<OSNotification> { return; }
+  handleNotificationReceived(): Observable<OSNotification> { return; }
 
   /**
    * Callback to run when a notification is tapped on from the notification shade (**ANDROID**) or notification
@@ -345,7 +345,7 @@ export class OneSignal {
   @Cordova({
     observable: true
   })
-  static handleNotificationOpened(): Observable<OSNotificationOpenedResult> { return; }
+  handleNotificationOpened(): Observable<OSNotificationOpenedResult> { return; }
 
   /**
    * **iOS** - Settings for iOS apps
@@ -359,7 +359,7 @@ export class OneSignal {
    * @returns {any}
    */
   @Cordova({ sync: true })
-  static iOSSettings(settings: {
+  iOSSettings(settings: {
     kOSSettingsKeyAutoPrompt: boolean;
     kOSSettingsKeyInAppLaunchURL: boolean;
   }): any { return; }
@@ -370,7 +370,7 @@ export class OneSignal {
    * @returns {any}
    */
   @Cordova({ sync: true })
-  static endInit(): any { return; }
+  endInit(): any { return; }
 
   /**
    * Retrieve a list of tags that have been set on the user from the OneSignal server.
@@ -378,7 +378,7 @@ export class OneSignal {
    * @returns {Promise<any>} Returns a Promise that resolves when tags are recieved.
    */
   @Cordova()
-  static getTags(): Promise<any> { return; }
+  getTags(): Promise<any> { return; }
 
   /**
    * Lets you retrieve the OneSignal user id and device token.
@@ -391,7 +391,7 @@ export class OneSignal {
    *  pushToken {string} A push token is a Google/Apple assigned identifier(unique per device per app).
    */
   @Cordova()
-  static getIds(): Promise<{userId: string; pushToken: string}> { return; }
+  getIds(): Promise<{userId: string; pushToken: string}> { return; }
 
 
   /**
@@ -402,7 +402,7 @@ export class OneSignal {
    * @param {string} Value to set on the key. NOTE: Passing in a blank String deletes the key, you can also call deleteTag.
    */
   @Cordova({ sync: true })
-  static sendTag(key: string, value: string): void { }
+  sendTag(key: string, value: string): void { }
 
   /**
    * Tag a user based on an app event of your choosing so later you can create segments on [onesignal.com](https://onesignal.com/) to target these users.
@@ -411,7 +411,7 @@ export class OneSignal {
    * @param {string} Pass a json object with key/value pairs like: {key: "value", key2: "value2"}
    */
   @Cordova({ sync: true })
-  static sendTags(json: any): void { }
+  sendTags(json: any): void { }
 
   /**
    * Deletes a tag that was previously set on a user with `sendTag` or `sendTags`. Use `deleteTags` if you need to delete more than one.
@@ -419,7 +419,7 @@ export class OneSignal {
    * @param {string} Key to remove.
    */
   @Cordova({ sync: true })
-  static deleteTag(key: string): void { }
+  deleteTag(key: string): void { }
 
   /**
    * Deletes tags that were previously set on a user with `sendTag` or `sendTags`.
@@ -427,14 +427,14 @@ export class OneSignal {
    * @param {Array<string>} Keys to remove.
    */
   @Cordova({ sync: true })
-  static deleteTags(keys: string[]): void { }
+  deleteTags(keys: string[]): void { }
 
   /**
    * Call this when you would like to prompt an iOS user to accept push notifications with the default system prompt.
    * Only works if you set `kOSSettingsAutoPrompt` to `false` in `iOSSettings`
    */
   @Cordova({ sync: true })
-  static registerForPushNotifications(): void { }
+  registerForPushNotifications(): void { }
 
   /**
   * Warning:
@@ -446,7 +446,7 @@ export class OneSignal {
   * @param {boolean} false to disable vibrate, true to re-enable it.
   */
   @Cordova({ sync: true })
-  static enableVibrate(enable: boolean): void { }
+  enableVibrate(enable: boolean): void { }
 
   /**
   * Warning:
@@ -458,7 +458,7 @@ export class OneSignal {
   * @param {boolean} false to disable sound, true to re-enable it.
   */
   @Cordova({ sync: true })
-  static enableSound(enable: boolean): void { }
+  enableSound(enable: boolean): void { }
 
   /**
   *
@@ -468,7 +468,7 @@ export class OneSignal {
   * @returns {any}
   */
   @Cordova({ sync: true })
-  static inFocusDisplaying(displayOption: OSDisplayType): any { return; }
+  inFocusDisplaying(displayOption: OSDisplayType): any { return; }
 
   /**
   * You can call this method with false to opt users out of receiving all notifications through OneSignal.
@@ -477,7 +477,7 @@ export class OneSignal {
   * @param {boolean} enable
   */
   @Cordova({ sync: true })
-  static setSubscription(enable: boolean): void { }
+  setSubscription(enable: boolean): void { }
 
   /**
   *
@@ -485,20 +485,20 @@ export class OneSignal {
   * @returns {Promise<any>} Returns a Promise that resolves if the notification was send successfully.
   */
   @Cordova()
-  static postNotification(notificationObj: OSNotification): Promise<any> { return; }
+  postNotification(notificationObj: OSNotification): Promise<any> { return; }
 
   /**
   * Prompts the user for location permission to allow geotagging based on the "Location radius" filter on the OneSignal dashboard.
   */
   @Cordova({ sync: true })
-  static promptLocation(): void { }
+  promptLocation(): void { }
 
   /**
    *
    * @param email {string}
    */
   @Cordova({ sync: true })
-  static syncHashedEmail(email: string): void { }
+  syncHashedEmail(email: string): void { }
 
   /**
   * Enable logging to help debug if you run into an issue setting up OneSignal.
@@ -509,7 +509,7 @@ export class OneSignal {
   * @param {loglevel} contains two properties: logLevel (for console logging) and visualLevel (for dialog messages)
   */
   @Cordova({ sync: true })
-  static setLogLevel(logLevel: {
+  setLogLevel(logLevel: {
     logLevel: number,
     visualLevel: number
   }): void { }
diff --git a/src/@ionic-native/plugins/pay-pal/index.ts b/src/@ionic-native/plugins/pay-pal/index.ts
index d48198eb9..d87b393d1 100644
--- a/src/@ionic-native/plugins/pay-pal/index.ts
+++ b/src/@ionic-native/plugins/pay-pal/index.ts
@@ -71,7 +71,7 @@ export class PayPal {
    * @returns {Promise<string>}
    */
   @Cordova()
-  static version(): Promise<string> {return; }
+  version(): Promise<string> {return; }
 
   /**
    * You must preconnect to PayPal to prepare the device for processing payments.
@@ -83,7 +83,7 @@ export class PayPal {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static init(clientIdsForEnvironments: PayPalEnvironment): Promise<any> {return; }
+  init(clientIdsForEnvironments: PayPalEnvironment): Promise<any> {return; }
 
   /**
    * You must preconnect to PayPal to prepare the device for processing payments.
@@ -95,7 +95,7 @@ export class PayPal {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static prepareToRender(environment: string, configuration: PayPalConfiguration): Promise<any> {return; }
+  prepareToRender(environment: string, configuration: PayPalConfiguration): Promise<any> {return; }
 
   /**
    * Start PayPal UI to collect payment from the user.
@@ -106,7 +106,7 @@ export class PayPal {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static renderSinglePaymentUI(payment: PayPalPayment): Promise<any> {return; }
+  renderSinglePaymentUI(payment: PayPalPayment): Promise<any> {return; }
 
   /**
    * Once a user has consented to future payments, when the user subsequently initiates a PayPal payment
@@ -119,14 +119,14 @@ export class PayPal {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static clientMetadataID(): Promise<any> {return; }
+  clientMetadataID(): Promise<any> {return; }
 
   /**
    * Please Read Docs on Future Payments at https://github.com/paypal/PayPal-iOS-SDK#future-payments
    * @returns {Promise<any>}
    */
   @Cordova()
-  static renderFuturePaymentUI(): Promise<any> {return; }
+  renderFuturePaymentUI(): Promise<any> {return; }
 
   /**
    * Please Read Docs on Profile Sharing at https://github.com/paypal/PayPal-iOS-SDK#profile-sharing
@@ -136,7 +136,7 @@ export class PayPal {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static renderProfileSharingUI(scopes: string[]): Promise<any> {return; }
+  renderProfileSharingUI(scopes: string[]): Promise<any> {return; }
 }
 
 export interface PayPalEnvironment {
diff --git a/src/@ionic-native/plugins/photo-viewer/index.ts b/src/@ionic-native/plugins/photo-viewer/index.ts
index a6775a1c9..6b16ce806 100644
--- a/src/@ionic-native/plugins/photo-viewer/index.ts
+++ b/src/@ionic-native/plugins/photo-viewer/index.ts
@@ -27,5 +27,5 @@ export class PhotoViewer {
    * @param options {any}
    */
   @Cordova({sync: true})
-  static show(url: string, title?: string, options?: {share?: boolean}): void { }
+  show(url: string, title?: string, options?: {share?: boolean}): void { }
 }
diff --git a/src/@ionic-native/plugins/pin-dialog/index.ts b/src/@ionic-native/plugins/pin-dialog/index.ts
index bc107ff6b..20ce6ecb1 100644
--- a/src/@ionic-native/plugins/pin-dialog/index.ts
+++ b/src/@ionic-native/plugins/pin-dialog/index.ts
@@ -38,6 +38,6 @@ export class PinDialog {
   @Cordova({
     successIndex: 1
   })
-  static prompt(message: string, title: string, buttons: string[]): Promise<{ buttonIndex: number, input1: string }> { return; }
+  prompt(message: string, title: string, buttons: string[]): Promise<{ buttonIndex: number, input1: string }> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/pinterest/index.ts b/src/@ionic-native/plugins/pinterest/index.ts
index 2e45c0800..213e51d6a 100644
--- a/src/@ionic-native/plugins/pinterest/index.ts
+++ b/src/@ionic-native/plugins/pinterest/index.ts
@@ -191,7 +191,7 @@ export class Pinterest {
    * @returns {Promise<any>} The response object will contain the user's profile data, as well as the access token (if you need to use it elsewhere, example: send it to your server and perform actions on behalf of the user).
    */
   @Cordova()
-  static login(scopes: string[]): Promise<any> { return; }
+  login(scopes: string[]): Promise<any> { return; }
 
   /**
    * Gets the authenticated user's profile
@@ -201,7 +201,7 @@ export class Pinterest {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static getMe(fields?: string): Promise<PinterestUser> { return; }
+  getMe(fields?: string): Promise<PinterestUser> { return; }
 
   /**
    *
@@ -212,7 +212,7 @@ export class Pinterest {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static getMyPins(fields?: string, limit?: number): Promise<Array<PinterestPin>> { return; }
+  getMyPins(fields?: string, limit?: number): Promise<Array<PinterestPin>> { return; }
 
   /**
    *
@@ -223,7 +223,7 @@ export class Pinterest {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static getMyBoards(fields?: string, limit?: number): Promise<Array<PinterestBoard>> { return; }
+  getMyBoards(fields?: string, limit?: number): Promise<Array<PinterestBoard>> { return; }
 
   /**
    * Get the authenticated user's likes.
@@ -234,7 +234,7 @@ export class Pinterest {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static getMyLikes(fields?: string, limit?: number): Promise<Array<PinterestPin>> { return; }
+  getMyLikes(fields?: string, limit?: number): Promise<Array<PinterestPin>> { return; }
 
   /**
    * Get the authenticated user's followers.
@@ -245,7 +245,7 @@ export class Pinterest {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static getMyFollowers(fields?: string, limit?: number): Promise<Array<PinterestUser>> { return; }
+  getMyFollowers(fields?: string, limit?: number): Promise<Array<PinterestUser>> { return; }
 
   /**
    * Get the authenticated user's followed boards.
@@ -256,7 +256,7 @@ export class Pinterest {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static getMyFollowedBoards(fields?: string, limit?: number): Promise<Array<PinterestBoard>> { return; }
+  getMyFollowedBoards(fields?: string, limit?: number): Promise<Array<PinterestBoard>> { return; }
 
   /**
    * Get the authenticated user's followed interests.
@@ -267,7 +267,7 @@ export class Pinterest {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static getMyFollowedInterests(fields?: string, limit?: number): Promise<any> { return; }
+  getMyFollowedInterests(fields?: string, limit?: number): Promise<any> { return; }
 
   /**
    * Get a user's profile.
@@ -279,7 +279,7 @@ export class Pinterest {
     successIndex: 1,
     errorIndex: 2
   })
-  static getUser(username: string, fields?: string): Promise<PinterestUser> { return; }
+  getUser(username: string, fields?: string): Promise<PinterestUser> { return; }
 
   /**
    * Get a board's data.
@@ -291,7 +291,7 @@ export class Pinterest {
     successIndex: 1,
     errorIndex: 2
   })
-  static getBoard(boardId: string, fields?: string): Promise<PinterestBoard> { return; }
+  getBoard(boardId: string, fields?: string): Promise<PinterestBoard> { return; }
 
   /**
    * Get Pins of a specific board.
@@ -304,7 +304,7 @@ export class Pinterest {
     successIndex: 1,
     errorIndex: 2
   })
-  static getBoardPins(boardId: string, fields?: string, limit?: number): Promise<Array<PinterestPin>> { return; }
+  getBoardPins(boardId: string, fields?: string, limit?: number): Promise<Array<PinterestPin>> { return; }
 
   /**
    * Delete a board.
@@ -312,7 +312,7 @@ export class Pinterest {
    * @returns {Promise<PinterestUser>}
    */
   @Cordova()
-  static deleteBoard(boardId: string): Promise<any> { return; }
+  deleteBoard(boardId: string): Promise<any> { return; }
 
   /**
    * Create a new board for the authenticated user.
@@ -324,7 +324,7 @@ export class Pinterest {
     successIndex: 2,
     errorIndex: 3
   })
-  static createBoard(name: string, desc?: string): Promise<PinterestBoard> { return; }
+  createBoard(name: string, desc?: string): Promise<PinterestBoard> { return; }
 
   /**
    * Get a Pin by ID.
@@ -336,7 +336,7 @@ export class Pinterest {
     successIndex: 1,
     errorIndex: 2
   })
-  static getPin(pinId: string, fields?: string): Promise<PinterestPin> { return; }
+  getPin(pinId: string, fields?: string): Promise<PinterestPin> { return; }
 
   /**
    * Deletes a pin
@@ -344,7 +344,7 @@ export class Pinterest {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static deletePin(pinId: string): Promise<any> { return; }
+  deletePin(pinId: string): Promise<any> { return; }
 
   /**
    * Creates a Pin
@@ -358,6 +358,6 @@ export class Pinterest {
     successIndex: 4,
     errorIndex: 5
   })
-  static createPin(note: string, boardId: string, imageUrl: string, link?: string): Promise<PinterestPin> { return; }
+  createPin(note: string, boardId: string, imageUrl: string, link?: string): Promise<PinterestPin> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/power-management/index.ts b/src/@ionic-native/plugins/power-management/index.ts
index 72c537b27..5b89148e1 100644
--- a/src/@ionic-native/plugins/power-management/index.ts
+++ b/src/@ionic-native/plugins/power-management/index.ts
@@ -29,21 +29,21 @@ export class PowerManagement {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static acquire(): Promise<any> {return; }
+  acquire(): Promise<any> {return; }
 
   /**
    * This acquires a partial wakelock, allowing the screen to be dimmed.
    * @returns {Promise<any>}
    */
   @Cordova()
-  static dim(): Promise<any> {return; }
+  dim(): Promise<any> {return; }
 
   /**
    * Release the wakelock. It's important to do this when you're finished with the wakelock, to avoid unnecessary battery drain.
    * @returns {Promise<any>}
    */
   @Cordova()
-  static release(): Promise<any> {return; }
+  release(): Promise<any> {return; }
 
   /**
    * By default, the plugin will automatically release a wakelock when your app is paused (e.g. when the screen is turned off, or the user switches to another app).
@@ -52,5 +52,5 @@ export class PowerManagement {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static setReleaseOnPause(set: boolean): Promise<any> {return; }
+  setReleaseOnPause(set: boolean): Promise<any> {return; }
 }
diff --git a/src/@ionic-native/plugins/printer/index.ts b/src/@ionic-native/plugins/printer/index.ts
index ae4dd0667..d56e46f72 100644
--- a/src/@ionic-native/plugins/printer/index.ts
+++ b/src/@ionic-native/plugins/printer/index.ts
@@ -78,7 +78,7 @@ export class Printer {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  static isAvailable(): Promise<boolean> { return; }
+  isAvailable(): Promise<boolean> { return; }
 
   /**
    * Sends content to the printer.
@@ -87,6 +87,6 @@ export class Printer {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static print(content: string | HTMLElement, options?: PrintOptions): Promise<any> { return; }
+  print(content: string | HTMLElement, options?: PrintOptions): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/push/index.ts b/src/@ionic-native/plugins/push/index.ts
index 5b19df52d..19691143c 100644
--- a/src/@ionic-native/plugins/push/index.ts
+++ b/src/@ionic-native/plugins/push/index.ts
@@ -351,13 +351,13 @@ export class Push {
   @Cordova({
     sync: true
   })
-  static init(options: PushOptions): PushNotification { return; }
+  init(options: PushOptions): PushNotification { return; }
 
   /**
    * Check whether the push notification permission has been granted.
    * @return {Promise<{isEnabled: boolean}>} Returns a Promise that resolves with an object with one property: isEnabled, a boolean that indicates if permission has been granted.
    */
   @Cordova()
-  static hasPermission(): Promise<{ isEnabled: boolean }> { return; }
+  hasPermission(): Promise<{ isEnabled: boolean }> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/rollbar/index.ts b/src/@ionic-native/plugins/rollbar/index.ts
index d1e0b34c4..f738dc3c6 100644
--- a/src/@ionic-native/plugins/rollbar/index.ts
+++ b/src/@ionic-native/plugins/rollbar/index.ts
@@ -31,6 +31,6 @@ export class Rollbar {
    * @return {Promise<any>} Returns a promise that resolves when the plugin successfully initializes
    */
   @Cordova()
-  static init(): Promise<any> { return; }
+  init(): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/safari-view-controller/index.ts b/src/@ionic-native/plugins/safari-view-controller/index.ts
index 0c3d4e534..f7cba7680 100644
--- a/src/@ionic-native/plugins/safari-view-controller/index.ts
+++ b/src/@ionic-native/plugins/safari-view-controller/index.ts
@@ -66,7 +66,7 @@ export class SafariViewController {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  static isAvailable(): Promise<boolean> { return; }
+  isAvailable(): Promise<boolean> { return; }
 
   /**
    * Shows Safari View Controller
@@ -77,27 +77,27 @@ export class SafariViewController {
     successIndex: 1,
     errorIndex: 2
   })
-  static show(options?: SafariViewControllerOptions): Promise<any> { return; }
+  show(options?: SafariViewControllerOptions): Promise<any> { return; }
 
   /**
    * Hides Safari View Controller
    */
   @Cordova()
-  static hide(): void { }
+  hide(): void { }
 
   /**
    * Tries to connect to the  Chrome's custom tabs service. you must call this method before calling any of the other methods listed below.
    * @returns {Promise<any>}
    */
   @Cordova()
-  static connectToService(): Promise<any> { return; }
+  connectToService(): Promise<any> { return; }
 
   /**
    * Call this method whenever there's a chance the user will open an external url.
    * @returns {Promise<any>}
    */
   @Cordova()
-  static warmUp(): Promise<any> { return; }
+  warmUp(): Promise<any> { return; }
 
   /**
    * For even better performance optimization, call this methods if there's more than a 50% chance the user will open a certain URL.
@@ -105,6 +105,6 @@ export class SafariViewController {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static mayLaunchUrl(url: string): Promise<any> { return; }
+  mayLaunchUrl(url: string): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/screen-orientation/index.ts b/src/@ionic-native/plugins/screen-orientation/index.ts
index 04b45fe3c..6715afa94 100644
--- a/src/@ionic-native/plugins/screen-orientation/index.ts
+++ b/src/@ionic-native/plugins/screen-orientation/index.ts
@@ -54,13 +54,13 @@ export class ScreenOrientation {
    * @returns {Promise<any>} returns a promise that resolves when the screen orientation is locked, and rejects when an error occurs.
    */
   @Cordova({ otherPromise: true })
-  static lockOrientation(orientation: string): Promise<string> { return; }
+  lockOrientation(orientation: string): Promise<string> { return; }
 
   /**
    * Unlock and allow all orientations.
    */
   @Cordova({ sync: true })
-  static unlockOrientation(): void { }
+  unlockOrientation(): void { }
 
   /**
    * Get the current orientation of the device.
diff --git a/src/@ionic-native/plugins/screenshot/index.ts b/src/@ionic-native/plugins/screenshot/index.ts
index d9b4db121..8242c3500 100644
--- a/src/@ionic-native/plugins/screenshot/index.ts
+++ b/src/@ionic-native/plugins/screenshot/index.ts
@@ -36,7 +36,7 @@ export class Screenshot {
    * @param {string} filename. Name of the file as stored on the storage
    * @returns {Promise<any>}
    */
-  static save(format?: string, quality?: number, filename?: string): Promise<any> {
+  save(format?: string, quality?: number, filename?: string): Promise<any> {
     return new Promise<any>(
       (resolve, reject) => {
         navigator.screenshot.save(
@@ -62,7 +62,7 @@ export class Screenshot {
    *        Default quality is set to 100.
    * @returns {Promise<any>}
    */
-  static URI(quality?: number): Promise<any> {
+  URI(quality?: number): Promise<any> {
     return new Promise<any>(
       (resolve, reject) => {
         navigator.screenshot.URI(
diff --git a/src/@ionic-native/plugins/serial/index.ts b/src/@ionic-native/plugins/serial/index.ts
index 0771c5908..6495b17a7 100644
--- a/src/@ionic-native/plugins/serial/index.ts
+++ b/src/@ionic-native/plugins/serial/index.ts
@@ -55,7 +55,7 @@ export class Serial {
    * @return {Promise<any>} Returns a promise that resolves when permissions are granted
    */
   @Cordova()
-  static requestPermission(options: SerialPermissionOptions): Promise<any> { return; }
+  requestPermission(options: SerialPermissionOptions): Promise<any> { return; }
 
   /**
    * Open connection to a serial device
@@ -64,7 +64,7 @@ export class Serial {
    * @return {Promise<any>} Returns a promise that resolves when the serial connection is opened
    */
   @Cordova()
-  static open(options: SerialOpenOptions): Promise<any> { return; }
+  open(options: SerialOpenOptions): Promise<any> { return; }
 
   /**
    * Write to a serial connection
@@ -73,7 +73,7 @@ export class Serial {
    * @return {Promise<any>} Returns a promise that resolves when the write is complete
    */
   @Cordova()
-  static write(data: any): Promise<any> { return; }
+  write(data: any): Promise<any> { return; }
 
   /**
    * Write hex to a serial connection
@@ -82,7 +82,7 @@ export class Serial {
    * @return {Promise<any>} Returns a promise that resolves when the write is complete
    */
   @Cordova()
-  static writeHex(data: any): Promise<any> { return; }
+  writeHex(data: any): Promise<any> { return; }
 
   /**
    * Read from a serial connection
@@ -90,7 +90,7 @@ export class Serial {
    * @return {Promise<any>} Returns a promise that resolves with data read from the serial connection
    */
   @Cordova()
-  static read(): Promise<any> { return; }
+  read(): Promise<any> { return; }
 
   /**
    * Watch the incoming data from the serial connection. Clear the watch by unsubscribing from the observable
@@ -100,7 +100,7 @@ export class Serial {
   @Cordova({
     observable: true
   })
-  static registerReadCallback(): Observable<any> { return; }
+  registerReadCallback(): Observable<any> { return; }
 
   /**
    * Close the serial connection
@@ -108,6 +108,6 @@ export class Serial {
    * @return {Promise<any>} Returns a promise that resolves when the serial connection is closed
    */
   @Cordova()
-  static close(): Promise<any> { return; }
+  close(): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/shake/index.ts b/src/@ionic-native/plugins/shake/index.ts
index 714e33dd6..6204a7485 100644
--- a/src/@ionic-native/plugins/shake/index.ts
+++ b/src/@ionic-native/plugins/shake/index.ts
@@ -34,6 +34,6 @@ export class Shake {
     successIndex: 0,
     errorIndex: 2
   })
-  static startWatch(sensitivity?: number): Observable<any> {return; }
+  startWatch(sensitivity?: number): Observable<any> {return; }
 
 }
diff --git a/src/@ionic-native/plugins/sim/index.ts b/src/@ionic-native/plugins/sim/index.ts
index 2b8d6e4cc..d102bca8d 100644
--- a/src/@ionic-native/plugins/sim/index.ts
+++ b/src/@ionic-native/plugins/sim/index.ts
@@ -43,7 +43,7 @@ export class Sim {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static getSimInfo(): Promise<any> { return; }
+  getSimInfo(): Promise<any> { return; }
 
   /**
    * Check permission
@@ -52,7 +52,7 @@ export class Sim {
   @Cordova({
     platforms: ['Android']
   })
-  static hasReadPermission(): Promise<any> { return; }
+  hasReadPermission(): Promise<any> { return; }
 
   /**
    * Request permission
@@ -61,5 +61,5 @@ export class Sim {
   @Cordova({
     platforms: ['Android']
   })
-  static requestReadPermission(): Promise<any> { return; }
+  requestReadPermission(): Promise<any> { return; }
 }
diff --git a/src/@ionic-native/plugins/sms/index.ts b/src/@ionic-native/plugins/sms/index.ts
index 5fc3c2fc0..ca13c31e1 100644
--- a/src/@ionic-native/plugins/sms/index.ts
+++ b/src/@ionic-native/plugins/sms/index.ts
@@ -64,7 +64,7 @@ export class SMS {
     successIndex: 3,
     errorIndex: 4
   })
-  static send(
+  send(
     phoneNumber: string | string[],
     message: string,
     options?: SmsOptions
@@ -77,6 +77,6 @@ export class SMS {
   @Cordova({
     platforms: ['Android']
   })
-  static hasPermission(): Promise<boolean> { return; }
+  hasPermission(): Promise<boolean> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/socialsharing/index.ts b/src/@ionic-native/plugins/socialsharing/index.ts
index f59eae9e9..d2dcb0485 100644
--- a/src/@ionic-native/plugins/socialsharing/index.ts
+++ b/src/@ionic-native/plugins/socialsharing/index.ts
@@ -43,7 +43,7 @@ export class SocialSharing {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static share(message?: string, subject?: string, file?: string|string[], url?: string): Promise<any> { return; }
+  share(message?: string, subject?: string, file?: string|string[], url?: string): Promise<any> { return; }
 
   /**
    * Shares using the share sheet with additional options and returns a result object or an error message (requires plugin version 5.1.0+)
@@ -53,7 +53,7 @@ export class SocialSharing {
   @Cordova({
     platforms: ['iOS', 'Android']
   })
-  static shareWithOptions(options: { message?: string, subject?: string, files?: string|string[], url?: string, chooserTitle?: string }): Promise<any> { return; }
+  shareWithOptions(options: { message?: string, subject?: string, files?: string|string[], url?: string, chooserTitle?: string }): Promise<any> { return; }
 
   /**
    * Checks if you can share via a specific app.
@@ -69,7 +69,7 @@ export class SocialSharing {
     errorIndex: 6,
     platforms: ['iOS', 'Android']
   })
-  static canShareVia(appName: string, message?: string, subject?: string, image?: string, url?: string): Promise<any> { return; }
+  canShareVia(appName: string, message?: string, subject?: string, image?: string, url?: string): Promise<any> { return; }
 
   /**
    * Shares directly to Twitter
@@ -83,7 +83,7 @@ export class SocialSharing {
     errorIndex: 4,
     platforms: ['iOS', 'Android']
   })
-  static shareViaTwitter(message: string, image?: string, url?: string): Promise<any> { return; }
+  shareViaTwitter(message: string, image?: string, url?: string): Promise<any> { return; }
 
   /**
    * Shares directly to Facebook
@@ -97,7 +97,7 @@ export class SocialSharing {
     errorIndex: 4,
     platforms: ['iOS', 'Android']
   })
-  static shareViaFacebook(message: string, image?: string, url?: string): Promise<any> { return; }
+  shareViaFacebook(message: string, image?: string, url?: string): Promise<any> { return; }
 
 
   /**
@@ -113,7 +113,7 @@ export class SocialSharing {
     errorIndex: 5,
     platforms: ['iOS', 'Android']
   })
-  static shareViaFacebookWithPasteMessageHint(message: string, image?: string, url?: string, pasteMessageHint?: string): Promise<any> { return; }
+  shareViaFacebookWithPasteMessageHint(message: string, image?: string, url?: string, pasteMessageHint?: string): Promise<any> { return; }
 
   /**
    * Shares directly to Instagram
@@ -124,7 +124,7 @@ export class SocialSharing {
   @Cordova({
     platforms: ['iOS', 'Android']
   })
-  static shareViaInstagram(message: string, image: string): Promise<any> { return; }
+  shareViaInstagram(message: string, image: string): Promise<any> { return; }
 
   /**
    * Shares directly to WhatsApp
@@ -138,7 +138,7 @@ export class SocialSharing {
     errorIndex: 4,
     platforms: ['iOS', 'Android']
   })
-  static shareViaWhatsApp(message: string, image?: string, url?: string): Promise<any> { return; }
+  shareViaWhatsApp(message: string, image?: string, url?: string): Promise<any> { return; }
 
   /**
    * Shares directly to a WhatsApp Contact
@@ -153,7 +153,7 @@ export class SocialSharing {
     errorIndex: 5,
     platforms: ['iOS', 'Android']
   })
-  static shareViaWhatsAppToReceiver(receiver: string, message: string, image?: string, url?: string): Promise<any> { return; }
+  shareViaWhatsAppToReceiver(receiver: string, message: string, image?: string, url?: string): Promise<any> { return; }
 
   /**
    * Share via SMS
@@ -164,7 +164,7 @@ export class SocialSharing {
   @Cordova({
     platforms: ['iOS', 'Android']
   })
-  static shareViaSMS(messge: string, phoneNumber: string): Promise<any> { return; }
+  shareViaSMS(messge: string, phoneNumber: string): Promise<any> { return; }
 
   /**
    * Checks if you can share via email
@@ -173,7 +173,7 @@ export class SocialSharing {
   @Cordova({
     platforms: ['iOS', 'Android']
   })
-  static canShareViaEmail(): Promise<any> { return; }
+  canShareViaEmail(): Promise<any> { return; }
 
   /**
    * Share via Email
@@ -190,7 +190,7 @@ export class SocialSharing {
     successIndex: 6,
     errorIndex: 7
   })
-  static shareViaEmail(message: string, subject: string, to: string[], cc?: string[], bcc?: string[], files?: string|string[]): Promise<any> { return; }
+  shareViaEmail(message: string, subject: string, to: string[], cc?: string[], bcc?: string[], files?: string|string[]): Promise<any> { return; }
 
   /**
    * Share via AppName
@@ -206,5 +206,5 @@ export class SocialSharing {
     errorIndex: 6,
     platforms: ['iOS', 'Android']
   })
-  static shareVia(appName: string, message: string, subject?: string, image?: string, url?: string): Promise<any> { return; }
+  shareVia(appName: string, message: string, subject?: string, image?: string, url?: string): Promise<any> { return; }
 }
diff --git a/src/@ionic-native/plugins/speech-recognition/index.ts b/src/@ionic-native/plugins/speech-recognition/index.ts
index 6e34877fc..942e1b2c2 100644
--- a/src/@ionic-native/plugins/speech-recognition/index.ts
+++ b/src/@ionic-native/plugins/speech-recognition/index.ts
@@ -102,7 +102,7 @@ export class SpeechRecognition {
    * @return {Promise<boolean>}
    */
   @Cordova()
-  static isRecognitionAvailable(): Promise<boolean> {
+  isRecognitionAvailable(): Promise<boolean> {
     return;
   }
 
@@ -115,7 +115,7 @@ export class SpeechRecognition {
     observable: true,
 
   })
-  static startListening(options?: SpeechRecognitionListeningOptions): Observable<Array<string>> {
+  startListening(options?: SpeechRecognitionListeningOptions): Observable<Array<string>> {
     return;
   }
 
@@ -125,7 +125,7 @@ export class SpeechRecognition {
   @Cordova({
     platforms: ['iOS']
   })
-  static stopListening(): Promise<void> {
+  stopListening(): Promise<void> {
     return;
   }
 
@@ -134,7 +134,7 @@ export class SpeechRecognition {
    * @return {Promise< Array<string> >} list of languages
    */
   @Cordova()
-  static getSupportedLanguages(): Promise<Array<string>> {
+  getSupportedLanguages(): Promise<Array<string>> {
     return;
   }
 
@@ -143,7 +143,7 @@ export class SpeechRecognition {
    * @return {Promise<boolean>} has permission
    */
   @Cordova()
-  static hasPermission(): Promise<boolean> {
+  hasPermission(): Promise<boolean> {
     return;
   }
 
@@ -152,7 +152,7 @@ export class SpeechRecognition {
    * @return {Promise<void>}
    */
   @Cordova()
-  static requestPermission(): Promise<void> {
+  requestPermission(): Promise<void> {
     return;
   }
 
diff --git a/src/@ionic-native/plugins/spinnerdialog/index.ts b/src/@ionic-native/plugins/spinnerdialog/index.ts
index 53e305dc7..c9c7f3765 100644
--- a/src/@ionic-native/plugins/spinnerdialog/index.ts
+++ b/src/@ionic-native/plugins/spinnerdialog/index.ts
@@ -43,7 +43,7 @@ export class SpinnerDialog {
   @Cordova({
     sync: true
   })
-  static show(title?: string, message?: string, cancelCallback?: any, iOSOptions?: SpinnerDialogIOSOptions): void {}
+  show(title?: string, message?: string, cancelCallback?: any, iOSOptions?: SpinnerDialogIOSOptions): void {}
 
   /**
    * Hides the spinner dialog if visible
@@ -51,6 +51,6 @@ export class SpinnerDialog {
   @Cordova({
     sync: true
   })
-  static hide(): void {}
+  hide(): void {}
 
 }
diff --git a/src/@ionic-native/plugins/splashscreen/index.ts b/src/@ionic-native/plugins/splashscreen/index.ts
index f4b459c09..754038909 100644
--- a/src/@ionic-native/plugins/splashscreen/index.ts
+++ b/src/@ionic-native/plugins/splashscreen/index.ts
@@ -30,7 +30,7 @@ export class Splashscreen {
   @Cordova({
     sync: true
   })
-  static show(): void {}
+  show(): void {}
 
   /**
    * Hides the splashscreen
@@ -38,6 +38,6 @@ export class Splashscreen {
   @Cordova({
     sync: true
   })
-  static hide(): void {}
+  hide(): void {}
 
 }
diff --git a/src/@ionic-native/plugins/sqlite/index.ts b/src/@ionic-native/plugins/sqlite/index.ts
index d756f54c2..a17ff6816 100644
--- a/src/@ionic-native/plugins/sqlite/index.ts
+++ b/src/@ionic-native/plugins/sqlite/index.ts
@@ -60,7 +60,7 @@ export class SQLite {
 
   constructor() { }
 
-  static openDatabase(config: any): Promise<SQLite> {
+  openDatabase(config: any): Promise<SQLite> {
     return new SQLite().openDatabase(config);
   }
 
@@ -206,13 +206,13 @@ export class SQLite {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static echoTest(): Promise<any> { return; }
+  echoTest(): Promise<any> { return; }
 
   /**
    * @param first
    * @returns {Promise<any>}
    */
   @Cordova()
-  static deleteDatabase(first): Promise<any> { return; }
+  deleteDatabase(first): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/statusbar/index.ts b/src/@ionic-native/plugins/statusbar/index.ts
index 3d15e5626..25d013d76 100644
--- a/src/@ionic-native/plugins/statusbar/index.ts
+++ b/src/@ionic-native/plugins/statusbar/index.ts
@@ -40,7 +40,7 @@ export class StatusBar {
   @Cordova({
     sync: true
   })
-  static overlaysWebView(doesOverlay: boolean) { };
+  overlaysWebView(doesOverlay: boolean) { };
 
   /**
    * Use the default statusbar (dark text, for light backgrounds).
@@ -48,7 +48,7 @@ export class StatusBar {
   @Cordova({
     sync: true
   })
-  static styleDefault() { };
+  styleDefault() { };
 
   /**
    * Use the lightContent statusbar (light text, for dark backgrounds).
@@ -56,7 +56,7 @@ export class StatusBar {
   @Cordova({
     sync: true
   })
-  static styleLightContent() { };
+  styleLightContent() { };
 
   /**
    * Use the blackTranslucent statusbar (light text, for dark backgrounds).
@@ -64,7 +64,7 @@ export class StatusBar {
   @Cordova({
     sync: true
   })
-  static styleBlackTranslucent() { };
+  styleBlackTranslucent() { };
 
   /**
    * Use the blackOpaque statusbar (light text, for dark backgrounds).
@@ -72,7 +72,7 @@ export class StatusBar {
   @Cordova({
     sync: true
   })
-  static styleBlackOpaque() { };
+  styleBlackOpaque() { };
 
   /**
    * Set the status bar to a specific named color. Valid options:
@@ -85,7 +85,7 @@ export class StatusBar {
   @Cordova({
     sync: true
   })
-  static backgroundColorByName(colorName: string) { };
+  backgroundColorByName(colorName: string) { };
 
   /**
    * Set the status bar to a specific hex color (CSS shorthand supported!).
@@ -97,7 +97,7 @@ export class StatusBar {
   @Cordova({
     sync: true
   })
-  static backgroundColorByHexString(hexString: string) { };
+  backgroundColorByHexString(hexString: string) { };
 
   /**
    * Hide the StatusBar
@@ -105,7 +105,7 @@ export class StatusBar {
   @Cordova({
     sync: true
   })
-  static hide() { };
+  hide() { };
 
   /**
   * Show the StatusBar
@@ -113,7 +113,7 @@ export class StatusBar {
   @Cordova({
     sync: true
   })
-  static show() { };
+  show() { };
 
   /**
    * Whether the StatusBar is currently visible or not.
diff --git a/src/@ionic-native/plugins/stepcounter/index.ts b/src/@ionic-native/plugins/stepcounter/index.ts
index 19f221747..b969da009 100644
--- a/src/@ionic-native/plugins/stepcounter/index.ts
+++ b/src/@ionic-native/plugins/stepcounter/index.ts
@@ -37,40 +37,40 @@ export class Stepcounter {
    * @returns {Promise<any | number>} Returns a Promise that resolves on success or rejects on failure
    */
   @Cordova()
-  static start(startingOffset: number): Promise<number | any> { return; }
+  start(startingOffset: number): Promise<number | any> { return; }
 
   /**
    * Stop the step counter
    * @returns {Promise<any | number>} Returns a Promise that resolves on success with the amount of steps since the start command has been called, or rejects on failure
    */
   @Cordova()
-  static stop(): Promise<number | any> { return; }
+  stop(): Promise<number | any> { return; }
 
   /**
    * Get the amount of steps for today (or -1 if it no data given)
    * @returns {Promise<any | number>} Returns a Promise that resolves on success with the amount of steps today, or rejects on failure
    */
   @Cordova()
-  static getTodayStepCount(): Promise<number | any> { return; }
+  getTodayStepCount(): Promise<number | any> { return; }
 
   /**
    * Get the amount of steps since the start command has been called
    * @returns {Promise<any | number>} Returns a Promise that resolves on success with the amount of steps since the start command has been called, or rejects on failure
    */
   @Cordova()
-  static getStepCount(): Promise<number | any> { return; }
+  getStepCount(): Promise<number | any> { return; }
 
   /**
    * Returns true/false if Android device is running >API level 19 && has the step counter API available
    * @returns {Promise<any | boolean>} Returns a Promise that resolves on success, or rejects on failure
    */
   @Cordova()
-  static deviceCanCountSteps(): Promise<boolean | any> { return; }
+  deviceCanCountSteps(): Promise<boolean | any> { return; }
 
   /**
    * Get the step history (JavaScript object)
    * @returns {Promise<any>} Returns a Promise that resolves on success, or rejects on failure
    */
   @Cordova()
-  static getHistory(): Promise<any> { return; }
+  getHistory(): Promise<any> { return; }
 }
diff --git a/src/@ionic-native/plugins/streaming-media/index.ts b/src/@ionic-native/plugins/streaming-media/index.ts
index e1c49e7dd..a533c6832 100644
--- a/src/@ionic-native/plugins/streaming-media/index.ts
+++ b/src/@ionic-native/plugins/streaming-media/index.ts
@@ -53,7 +53,7 @@ export class StreamingMedia {
    * @param options {StreamingVideoOptions} Options
    */
   @Cordova({sync: true})
-  static playVideo(videoUrl: string, options?: StreamingVideoOptions): void { }
+  playVideo(videoUrl: string, options?: StreamingVideoOptions): void { }
 
   /**
    * Streams an audio
@@ -61,24 +61,24 @@ export class StreamingMedia {
    * @param options {StreamingAudioOptions} Options
    */
   @Cordova({sync: true})
-  static playAudio(audioUrl: string, options?: StreamingAudioOptions): void { }
+  playAudio(audioUrl: string, options?: StreamingAudioOptions): void { }
 
   /**
    * Stops streaming audio
    */
   @Cordova({sync: true})
-  static stopAudio(): void { }
+  stopAudio(): void { }
 
   /**
    * Pauses streaming audio
    */
   @Cordova({sync: true, platforms: ['iOS']})
-  static pauseAudio(): void { }
+  pauseAudio(): void { }
 
   /**
    * Resumes streaming audio
    */
   @Cordova({sync: true, platforms: ['iOS']})
-  static resumeAudio(): void { }
+  resumeAudio(): void { }
 
 }
diff --git a/src/@ionic-native/plugins/stripe/index.ts b/src/@ionic-native/plugins/stripe/index.ts
index c68bcd6ef..e43b3b419 100644
--- a/src/@ionic-native/plugins/stripe/index.ts
+++ b/src/@ionic-native/plugins/stripe/index.ts
@@ -95,7 +95,7 @@ export class Stripe {
    * @return {Promise<void>}
    */
   @Cordova()
-  static setPublishableKey(publishableKey: string): Promise<void> { return; }
+  setPublishableKey(publishableKey: string): Promise<void> { return; }
 
   /**
    * Create Credit Card Token
@@ -103,6 +103,6 @@ export class Stripe {
    * @return {Promise<string>} returns a promise that resolves with the token, or reject with an error
    */
   @Cordova()
-  static createCardToken(params: StripeCardTokenParams): Promise<string> { return; }
+  createCardToken(params: StripeCardTokenParams): Promise<string> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/text-to-speech/index.ts b/src/@ionic-native/plugins/text-to-speech/index.ts
index 4216363fc..3f50df40a 100644
--- a/src/@ionic-native/plugins/text-to-speech/index.ts
+++ b/src/@ionic-native/plugins/text-to-speech/index.ts
@@ -45,7 +45,7 @@ export class TextToSpeech {
     successIndex: 1,
     errorIndex: 2
   })
-  static speak(options: string | TTSOptions): Promise<any> {
+  speak(options: string | TTSOptions): Promise<any> {
     return;
   }
 
diff --git a/src/@ionic-native/plugins/toast/index.ts b/src/@ionic-native/plugins/toast/index.ts
index 08a6dcd00..fb61ffe2e 100644
--- a/src/@ionic-native/plugins/toast/index.ts
+++ b/src/@ionic-native/plugins/toast/index.ts
@@ -79,7 +79,7 @@ export class Toast {
     observable: true,
     clearFunction: 'hide'
   })
-  static show(
+  show(
     message: string,
     duration: string,
     position: string
@@ -90,7 +90,7 @@ export class Toast {
    * @returns {Promise<any>} Returns a Promise that resolves on success.
    */
   @Cordova()
-  static hide(): Promise<any> { return; }
+  hide(): Promise<any> { return; }
 
   /**
    * Show a native toast with the given options.
@@ -107,7 +107,7 @@ export class Toast {
     observable: true,
     clearFunction: 'hide'
   })
-  static showWithOptions(options: ToastOptions): Observable<any> { return; }
+  showWithOptions(options: ToastOptions): Observable<any> { return; }
 
   /**
    * Shorthand for `show(message, 'short', 'top')`.
@@ -118,7 +118,7 @@ export class Toast {
     observable: true,
     clearFunction: 'hide'
   })
-  static showShortTop(message: string): Observable<any> { return; }
+  showShortTop(message: string): Observable<any> { return; }
 
   /**
    * Shorthand for `show(message, 'short', 'center')`.
@@ -129,7 +129,7 @@ export class Toast {
     observable: true,
     clearFunction: 'hide'
   })
-  static showShortCenter(message: string): Observable<any> { return; }
+  showShortCenter(message: string): Observable<any> { return; }
 
 
   /**
@@ -141,7 +141,7 @@ export class Toast {
     observable: true,
     clearFunction: 'hide'
   })
-  static showShortBottom(message: string): Observable<any> { return; }
+  showShortBottom(message: string): Observable<any> { return; }
 
 
   /**
@@ -153,7 +153,7 @@ export class Toast {
     observable: true,
     clearFunction: 'hide'
   })
-  static showLongTop(message: string): Observable<any> { return; }
+  showLongTop(message: string): Observable<any> { return; }
 
 
   /**
@@ -165,7 +165,7 @@ export class Toast {
     observable: true,
     clearFunction: 'hide'
   })
-  static showLongCenter(message: string): Observable<any> { return; }
+  showLongCenter(message: string): Observable<any> { return; }
 
 
   /**
@@ -177,6 +177,6 @@ export class Toast {
     observable: true,
     clearFunction: 'hide'
   })
-  static showLongBottom(message: string): Observable<any> { return; }
+  showLongBottom(message: string): Observable<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/touchid/index.ts b/src/@ionic-native/plugins/touchid/index.ts
index aa5df7663..dd59f58e8 100644
--- a/src/@ionic-native/plugins/touchid/index.ts
+++ b/src/@ionic-native/plugins/touchid/index.ts
@@ -61,7 +61,7 @@ export class TouchID {
    * @returns {Promise<any>} Returns a Promise that resolves if yes, rejects if no.
    */
   @Cordova()
-  static isAvailable(): Promise<any> { return; }
+  isAvailable(): Promise<any> { return; }
 
   /**
    * Show TouchID dialog and wait for a fingerprint scan. If user taps 'Enter Password' button, brings up standard system passcode screen.
@@ -70,7 +70,7 @@ export class TouchID {
    * @returns {Promise<any>} Returns a Promise the resolves if the fingerprint scan was successful, rejects with an error code (see above).
    */
   @Cordova()
-  static verifyFingerprint(message: string): Promise<any> { return; }
+  verifyFingerprint(message: string): Promise<any> { return; }
 
   /**
    * Show TouchID dialog and wait for a fingerprint scan. If user taps 'Enter Password' button, rejects with code '-3' (see above).
@@ -79,7 +79,7 @@ export class TouchID {
    * @returns {Promise<any>} Returns a Promise the resolves if the fingerprint scan was successful, rejects with an error code (see above).
    */
   @Cordova()
-  static verifyFingerprintWithCustomPasswordFallback(message: string): Promise<any> { return; }
+  verifyFingerprintWithCustomPasswordFallback(message: string): Promise<any> { return; }
 
   /**
    * Show TouchID dialog with custom 'Enter Password' message and wait for a fingerprint scan. If user taps 'Enter Password' button, rejects with code '-3' (see above).
@@ -89,6 +89,6 @@ export class TouchID {
    * @returns {Promise<any>} Returns a Promise the resolves if the fingerprint scan was successful, rejects with an error code (see above).
    */
   @Cordova()
-  static verifyFingerprintWithCustomPasswordFallbackAndEnterPasswordLabel(message: string, enterPasswordLabel: string): Promise<any> { return; }
+  verifyFingerprintWithCustomPasswordFallbackAndEnterPasswordLabel(message: string, enterPasswordLabel: string): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/twitter-connect/index.ts b/src/@ionic-native/plugins/twitter-connect/index.ts
index 4164f88cb..3915cbf44 100644
--- a/src/@ionic-native/plugins/twitter-connect/index.ts
+++ b/src/@ionic-native/plugins/twitter-connect/index.ts
@@ -61,19 +61,19 @@ export class TwitterConnect {
    * @returns {Promise<TwitterConnectResponse>} returns a promise that resolves if logged in and rejects if failed to login
    */
   @Cordova()
-  static login(): Promise<TwitterConnectResponse> {return; }
+  login(): Promise<TwitterConnectResponse> {return; }
   /**
    * Logs out
    * @returns {Promise<any>} returns a promise that resolves if logged out and rejects if failed to logout
    */
   @Cordova()
-  static logout(): Promise<any> {return; }
+  logout(): Promise<any> {return; }
 
   /**
    * Returns user's profile information
    * @returns {Promise<any>} returns a promise that resolves if user profile is successfully retrieved and rejects if request fails
    */
   @Cordova()
-  static showUser(): Promise<any> {return; }
+  showUser(): Promise<any> {return; }
 }
 
diff --git a/src/@ionic-native/plugins/video-editor/index.ts b/src/@ionic-native/plugins/video-editor/index.ts
index dbaf5e3bf..5be0e74e0 100644
--- a/src/@ionic-native/plugins/video-editor/index.ts
+++ b/src/@ionic-native/plugins/video-editor/index.ts
@@ -173,7 +173,7 @@ export class VideoEditor {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static transcodeVideo(options: TranscodeOptions): Promise<string> { return; }
+  transcodeVideo(options: TranscodeOptions): Promise<string> { return; }
 
   /**
    * Trim a video
@@ -184,7 +184,7 @@ export class VideoEditor {
     callbackOrder: 'reverse',
     platforms: ['iOS']
   })
-  static trim(options: TrimOptions): Promise<string> { return; }
+  trim(options: TrimOptions): Promise<string> { return; }
 
   /**
    * Create a JPEG thumbnail from a video
@@ -194,7 +194,7 @@ export class VideoEditor {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static createThumbnail(options: CreateThumbnailOptions): Promise<string> { return; }
+  createThumbnail(options: CreateThumbnailOptions): Promise<string> { return; }
 
   /**
    * Get info on a video (width, height, orientation, duration, size, & bitrate)
@@ -204,6 +204,6 @@ export class VideoEditor {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  static getVideoInfo(options: GetVideoInfoOptions): Promise<VideoInfo> { return; }
+  getVideoInfo(options: GetVideoInfoOptions): Promise<VideoInfo> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/video-player/index.ts b/src/@ionic-native/plugins/video-player/index.ts
index 47270c11b..26e67b8c0 100644
--- a/src/@ionic-native/plugins/video-player/index.ts
+++ b/src/@ionic-native/plugins/video-player/index.ts
@@ -57,11 +57,11 @@ export class VideoPlayer {
    * @returns {Promise<any>} Resolves promise when the video was played successfully.
    */
   @Cordova()
-  static play(fileUrl: string, options?: VideoOptions): Promise<any> { return; }
+  play(fileUrl: string, options?: VideoOptions): Promise<any> { return; }
 
   /**
    * Stops the video playback immediatly.
    */
   @Cordova({ sync: true })
-  static close(): void { }
+  close(): void { }
 }
diff --git a/src/@ionic-native/plugins/webintent/index.ts b/src/@ionic-native/plugins/webintent/index.ts
index c7b4aac61..fb1ee8613 100644
--- a/src/@ionic-native/plugins/webintent/index.ts
+++ b/src/@ionic-native/plugins/webintent/index.ts
@@ -38,39 +38,39 @@ export class WebIntent {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static startActivity(options: { action: any, url: string, type?: string }): Promise<any> { return; }
+  startActivity(options: { action: any, url: string, type?: string }): Promise<any> { return; }
 
   /**
    * @param extra {any}
    * @returns {Promise<any>}
    */
   @Cordova()
-  static hasExtra(extra: any): Promise<any> { return; }
+  hasExtra(extra: any): Promise<any> { return; }
 
   /**
    * @param extra {any}
    * @returns {Promise<any>}
    */
   @Cordova()
-  static getExtra(extra: any): Promise<any> { return; }
+  getExtra(extra: any): Promise<any> { return; }
 
   /**
    * @returns {Promise<any>}
    */
   @Cordova()
-  static getUri(): Promise<string> { return; };
+  getUri(): Promise<string> { return; };
 
   /**
    * @returns {Promise<string>}
    */
   @Cordova()
-  static onNewIntent(): Promise<string> { return; };
+  onNewIntent(): Promise<string> { return; };
 
   /**
    * @param options {Object} { action: string, extras?: { option: boolean } }
    * @returns {Promise<any>}
    */
   @Cordova()
-  static sendBroadcast(options: { action: string, extras?: { option: boolean } }): Promise<any> { return; }
+  sendBroadcast(options: { action: string, extras?: { option: boolean } }): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/youtube-video-player/index.ts b/src/@ionic-native/plugins/youtube-video-player/index.ts
index 84a7dace9..bfc754f07 100644
--- a/src/@ionic-native/plugins/youtube-video-player/index.ts
+++ b/src/@ionic-native/plugins/youtube-video-player/index.ts
@@ -27,5 +27,5 @@ export class YoutubeVideoPlayer {
    * @param videoId {string} Video ID
    */
   @Cordova({sync: true})
-  static openVideo(videoId: string): void { }
+  openVideo(videoId: string): void { }
 }
diff --git a/src/@ionic-native/plugins/z-bar/index.ts b/src/@ionic-native/plugins/z-bar/index.ts
index 6201382b2..76183dcaf 100644
--- a/src/@ionic-native/plugins/z-bar/index.ts
+++ b/src/@ionic-native/plugins/z-bar/index.ts
@@ -80,6 +80,6 @@ export class ZBar {
    * @returns {Promise<any>} Returns a Promise that resolves with the scanned string, or rejects with an error.
    */
   @Cordova()
-  static scan(options: ZBarOptions): Promise<any> { return; }
+  scan(options: ZBarOptions): Promise<any> { return; }
 
 }
diff --git a/src/@ionic-native/plugins/zip/index.ts b/src/@ionic-native/plugins/zip/index.ts
index 6ec0386c7..4fcf64a7e 100644
--- a/src/@ionic-native/plugins/zip/index.ts
+++ b/src/@ionic-native/plugins/zip/index.ts
@@ -37,6 +37,6 @@ export class Zip {
     successIndex: 2,
     errorIndex: 4
   })
-  static unzip(sourceZip: string, destUrl: string, onProgress: Function): Promise<number> {return; }
+  unzip(sourceZip: string, destUrl: string, onProgress: Function): Promise<number> {return; }
 
 }