diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
index 392d933..e04935d 100644
--- a/client/dist/js/bundle.js
+++ b/client/dist/js/bundle.js
@@ -1 +1 @@
-!function(t){function e(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return t[r].call(o.exports,o,o.exports,e),o.l=!0,o.exports}var n={};e.m=t,e.c=n,e.i=function(t){return t},e.d=function(t,n,r){e.o(t,n)||Object.defineProperty(t,n,{configurable:!1,enumerable:!0,get:r})},e.n=function(t){var n=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(n,"a",n),n},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=6)}([function(t,e){t.exports=React},function(t,e){t.exports=ReactRedux},function(t,e){t.exports=Redux},function(t,e,n){"use strict";var r=n(8),o=n(1),u=(n.n(o),n(2)),i=(n.n(u),n.i(u.compose)(n.i(o.connect)(function(){return{}}),r.a));e.a=i},function(t,e,n){"use strict";var r=n(0),o=n.n(r),u=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t},i=function(t){return function(e){var n=u({},e);return n.readOnly=!0,o.a.createElement(t,n)}};e.a=i},function(t,e){t.exports=Injector},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=n(3),o=n(4),u=n(5),i=n.n(u);i.a.transform("cloudinary-sync-button",function(t){t.component("GalleryToolbar",r.a)}),i.a.transform("cloudinary-preview-image-field",function(t){t.component("PreviewImageField",o.a)})},function(t,e,n){"use strict";function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function o(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function u(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function i(){return{}}function a(t){return{setError:function(e){t(n.i(E.setErrorMessage)(e))}}}n.d(e,"b",function(){return _});var c=n(0),s=n.n(c),l=n(11),f=n.n(l),d=n(1),p=(n.n(d),n(2)),E=(n.n(p),n(10)),y=(n.n(E),function(){function t(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}return function(e,n,r){return n&&t(e.prototype,n),r&&t(e,r),e}}()),_={SYNC_BUTTON_KEY:"sync-with-cloudinary-button"},h=function(t){function e(t){r(this,e);var n=o(this,(e.__proto__||Object.getPrototypeOf(e)).call(this,t));return n.state={updating:!1},n.fetch=f.a,n}return u(e,t),y(e,[{key:"handleSyncWithCloudinary",value:function(){var t=this,e={credentials:"include"};this.fetch("/cloudinary-api/sync",e).then(function(e){200===e.status?e.json().then(t.handleSyncSuccess.bind(t)):e.json().then(t.handleSyncError.bind(t))}),delete this.state.updated,this.setState({updating:!0})}},{key:"handleSyncSuccess",value:function(t){this.setState({updating:!1,updated:t.result.count}),this.props.refreshPage()}},{key:"handleSyncError",value:function(t){var e=this.props.setError;this.setState({updating:!1}),e(ss.i18n._t("Cloudinary.SYNC_WITH_CLOUDINARY_"+t.error.toUpperCase(),t.description)),setTimeout(function(){e(null)},3e3)}},{key:"render",value:function(){var t=this,e=["btn","btn-secondary","font-icon-sync","btn--icon-xl"];this.state.updating&&e.push("updating");var n=ss.i18n._t("Cloudinary.SYNC_WITH_CLOUDINARY","Sync with Cloudinary");this.state.updating?n=ss.i18n._t("Cloudinary.UPDATING_FROM_CLOUDINARY","Updating from Cloudinary"):void 0!==this.state.updated&&(n=ss.i18n.sprintf(ss.i18n._t("Cloudinary.UPDATED_FROM_CLOUDINARY","%s Synced from Cloudinary"),this.state.updated));var r=function(){t.handleSyncWithCloudinary()};return s.a.createElement("button",{id:_.SYNC_BUTTON_KEY,className:e.join(" "),type:"button",onClick:r,title:n},s.a.createElement("span",{className:"btn__text btn__title"},n))}}]),e}(c.Component);e.a=n.i(p.compose)(n.i(d.connect)(i,a))(h)},function(t,e,n){"use strict";var r=n(0),o=n.n(r),u=n(7),i=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t},a=function(t){return function(e){var n=i({},e);return n.children=n.children||[],n.children=n.children.filter(function(t){return t.key!==u.b.SYNC_BUTTON_KEY}),n.children.push(function(){return o.a.createElement(u.a,{key:u.b.SYNC_BUTTON_KEY,refreshPage:n.refreshPage})}()),o.a.createElement(t,n)}};e.a=a},function(t,e,n){"use strict";function r(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}Object.defineProperty(e,"__esModule",{value:!0}),e.default=["DESELECT_FILES","SELECT_FILES","LOAD_FILE_REQUEST","LOAD_FILE_SUCCESS","HIGHLIGHT_FILES","UPDATE_BATCH_ACTIONS","SET_NOTICE_MESSAGE","SET_ERROR_MESSAGE","SET_ENABLE_DROPZONE","SET_FILE_BADGE","CLEAR_FILE_BADGE","ACTIVATE_MODAL","DEACTIVATE_MODAL","CONCATENATE_SELECT","SET_LOADING"].reduce(function(t,e){return Object.assign(t,r({},e,"GALLERY."+e))},{})},function(t,e,n){"use strict";function r(t,e){return function(n){n({type:_.default.LOAD_FILE_SUCCESS,payload:{id:t,file:e}})}}function o(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:null;return function(e){return e({type:_.default.SELECT_FILES,payload:{ids:t}})}}function u(t){return function(e){return e({type:_.default.CONCATENATE_SELECT,payload:!!t})}}function i(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:null;return function(e){return e({type:_.default.DESELECT_FILES,payload:{ids:t}})}}function a(t){return function(e){return e({type:_.default.SET_NOTICE_MESSAGE,payload:{message:t}})}}function c(t){return function(e){return e({type:_.default.SET_ERROR_MESSAGE,payload:{message:t}})}}function s(t){return function(e){return e({type:_.default.SET_ENABLE_DROPZONE,payload:{enableDropzone:t}})}}function l(t){return function(e){e({type:_.default.CLEAR_FILE_BADGE,payload:{id:t}})}}function f(t,e,n,r){return function(o,u){var i=u(),a=i.assetAdmin,c=a.gallery.badges.find(function(e){return e.id===t});c&&c.timer&&clearTimeout(c.timer);var s=r>0?setTimeout(function(){return l(t)(o)},r):null;o({type:_.default.SET_FILE_BADGE,payload:{id:t,message:e,status:n,timer:s}})}}function d(t){return function(e){e({type:_.default.ACTIVATE_MODAL,payload:t})}}function p(){return function(t){t({type:_.default.DEACTIVATE_MODAL})}}function E(t){return function(e){e({type:_.default.SET_LOADING,payload:!!t})}}Object.defineProperty(e,"__esModule",{value:!0}),e.loadFile=r,e.selectFiles=o,e.setConcatenateSelect=u,e.deselectFiles=i,e.setNoticeMessage=a,e.setErrorMessage=c,e.setEnableDropzone=s,e.clearFileBadge=l,e.setFileBadge=f,e.activateModal=d,e.deactivateModal=p,e.setLoading=E;var y=n(9),_=function(t){return t&&t.__esModule?t:{default:t}}(y)},function(t,e){t.exports=IsomorphicFetch}]);
\ No newline at end of file
+!function(e){function n(t){if(r[t])return r[t].exports;var o=r[t]={i:t,l:!1,exports:{}};return e[t].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r={};n.m=e,n.c=r,n.i=function(e){return e},n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="",n(n.s=2)}([function(e,n,r){"use strict";var t=r(3),o=r.n(t),u=Object.assign||function(e){for(var n=1;n<arguments.length;n++){var r=arguments[n];for(var t in r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t])}return e},c=function(e){return function(n){var r=u({},n);return r.readOnly=!0,o.a.createElement(e,r)}};n.a=c},function(e,n){e.exports=Injector},function(e,n,r){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var t=r(0),o=r(1);r.n(o).a.transform("cloudinary-preview-image-field",function(e){e.component("PreviewImageField",t.a)})},function(e,n){e.exports=React}]);
\ No newline at end of file
diff --git a/client/src/js/app.js b/client/src/js/app.js
index 024e6b3..4454a62 100644
--- a/client/src/js/app.js
+++ b/client/src/js/app.js
@@ -1,16 +1,8 @@
 
-import CloudinaryEnhancedGalleryToolbar from './components/CloudinaryEnhancedGalleryToolbar';
 import CloudinaryPreviewImageField from './components/CloudinaryPreviewImageField';
 
 import Injector from 'lib/Injector';
 
-Injector.transform(
-    'cloudinary-sync-button',
-    updater => {
-        updater.component('GalleryToolbar', CloudinaryEnhancedGalleryToolbar);
-    }
-);
-
 Injector.transform(
     'cloudinary-preview-image-field',
     updater => {
diff --git a/client/src/js/components/CloudinaryEnhancedGalleryToolbar.js b/client/src/js/components/CloudinaryEnhancedGalleryToolbar.js
deleted file mode 100644
index 10052cb..0000000
--- a/client/src/js/components/CloudinaryEnhancedGalleryToolbar.js
+++ /dev/null
@@ -1,14 +0,0 @@
-
-import CloudinaryToolbarFields from './CloudinaryToolbarFields';
-
-import { connect } from 'react-redux';
-import { compose } from 'redux';
-
-const CloudinaryEnhancedGalleryToolbar = compose(
-    connect(
-        () => ({})
-    ),
-    CloudinaryToolbarFields
-);
-
-export default CloudinaryEnhancedGalleryToolbar;
diff --git a/client/src/js/components/CloudinarySync.js b/client/src/js/components/CloudinarySync.js
deleted file mode 100644
index 29405d1..0000000
--- a/client/src/js/components/CloudinarySync.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/* global ss */
-
-import React, { Component } from 'react';
-import fetch from 'isomorphic-fetch';
-import { connect } from 'react-redux';
-import { compose } from 'redux';
-
-import { setErrorMessage } from '../../../../../../silverstripe/asset-admin/client/src/state/gallery/GalleryActions';
-
-export const CONSTANTS = { SYNC_BUTTON_KEY: 'sync-with-cloudinary-button' };
-
-class CloudinarySync extends Component {
-    constructor(props) {
-        super(props);
-        this.state = { updating: false };
-        this.fetch = fetch;
-    }
-
-    handleSyncWithCloudinary() {
-        const opts = { credentials: 'include' };
-        this.fetch('/cloudinary-api/sync', opts).then(response => {
-            if (response.status === 200) {
-                response.json().then(this.handleSyncSuccess.bind(this));
-            } else {
-                response.json().then(this.handleSyncError.bind(this));
-            }
-        });
-        delete this.state.updated;
-        this.setState({
-            updating: true
-        });
-    }
-    handleSyncSuccess(data) {
-        this.setState({
-            updating: false,
-            updated: data.result.count
-        });
-
-        this.props.refreshPage();
-    }
-
-    handleSyncError(data) {
-        const { setError } = this.props;
-        this.setState({
-            updating: false
-        });
-        setError(ss.i18n._t(`Cloudinary.SYNC_WITH_CLOUDINARY_${data.error.toUpperCase()}`, data.description));
-        setTimeout(() => {
-            setError(null);
-        }, 3000);
-    }
-
-    render() {
-        const classes = ['btn', 'btn-secondary', 'font-icon-sync', 'btn--icon-xl'];
-        if (this.state.updating) {
-            classes.push('updating');
-        }
-
-        let message = ss.i18n._t('Cloudinary.SYNC_WITH_CLOUDINARY', 'Sync with Cloudinary');
-        if (this.state.updating) {
-            message = ss.i18n._t('Cloudinary.UPDATING_FROM_CLOUDINARY', 'Updating from Cloudinary');
-        } else if (this.state.updated !== undefined) {
-            message = ss.i18n.sprintf(ss.i18n._t('Cloudinary.UPDATED_FROM_CLOUDINARY', '%s Synced from Cloudinary'), this.state.updated);
-        }
-
-        const handleSyncWithCloudinary = () => {
-            this.handleSyncWithCloudinary();
-        };
-
-        return (
-          <button
-            id={CONSTANTS.SYNC_BUTTON_KEY}
-            className={classes.join(' ')}
-            type="button"
-            onClick={handleSyncWithCloudinary}
-            title={message}
-          >
-            <span className="btn__text btn__title">
-              {message}
-            </span>
-          </button>
-      );
-    }
-}
-
-
-function mapStateToProps() {
-    return {};
-}
-
-function mapDispatchToProps(dispatch) {
-    return {
-        setError(msg) {
-            dispatch(setErrorMessage(msg));
-        },
-    };
-}
-
-export default compose(
-    connect(mapStateToProps, mapDispatchToProps)
-)(CloudinarySync);
diff --git a/client/src/js/components/CloudinaryToolbarFields.js b/client/src/js/components/CloudinaryToolbarFields.js
deleted file mode 100644
index 5434906..0000000
--- a/client/src/js/components/CloudinaryToolbarFields.js
+++ /dev/null
@@ -1,25 +0,0 @@
-
-import React from 'react';
-import CloudinarySync, { CONSTANTS } from './CloudinarySync';
-
-const CloudinaryToolbarFields = (GalleryToolbar) => (props) => {
-    const newProps = {
-        ...props,
-    };
-
-    function renderSyncButton() {
-        return (<CloudinarySync
-          key={CONSTANTS.SYNC_BUTTON_KEY}
-          refreshPage={newProps.refreshPage}
-        />);
-    }
-
-    newProps.children = newProps.children || [];
-    newProps.children = newProps.children.filter(el => el.key !== CONSTANTS.SYNC_BUTTON_KEY);
-    newProps.children.push(renderSyncButton());
-    return (
-      <GalleryToolbar {...newProps} />
-    );
-};
-
-export default CloudinaryToolbarFields;
diff --git a/composer.json b/composer.json
index 5f4f32b..ca6537b 100644
--- a/composer.json
+++ b/composer.json
@@ -16,6 +16,7 @@
   "require": {
     "cloudinary/cloudinary_php": "dev-master",
     "php": ">=7.0.0",
+    "silverstripe/assets": "^1.1",
     "silverstripe/asset-admin": "^1.1"
   },
   "autoload": {
diff --git a/src/Model/File.php b/src/Model/File.php
index 01a8716..3e91a48 100644
--- a/src/Model/File.php
+++ b/src/Model/File.php
@@ -36,4 +36,11 @@ public function doArchive()
         $r = $api->delete_resources(array($this->PublicID));
         return parent::doArchive();
     }
+
+    public static function getOneByPublicId($publicId)
+    {
+        return static::get_one(static::class, [
+            'PublicID' => $publicId,
+        ]);
+    }
 }
diff --git a/src/Traits/CloudinaryFileTrait.php b/src/Traits/CloudinaryFileTrait.php
index 8d957f6..7f9e858 100644
--- a/src/Traits/CloudinaryFileTrait.php
+++ b/src/Traits/CloudinaryFileTrait.php
@@ -29,13 +29,6 @@ trait CloudinaryFileTrait
         'RemoteData' => 'Text',
     ];
 
-    public static function getOneByPublicId($publicId)
-    {
-        return static::get_one(static::class, [
-            'PublicID' => $publicId,
-        ]);
-    }
-
     public function updateFromCloudinary($resource)
     {
         $parentFolder = static::getParentFolderForResouce($resource);