diff --git a/app/Providers/OptionServiceProvider.php b/app/Providers/OptionServiceProvider.php
deleted file mode 100644
index 1134096..0000000
--- a/app/Providers/OptionServiceProvider.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use App\Services\Option;
-use Illuminate\Support\ServiceProvider;
-
-/**
- * Option Service Provider.
- *
- * @author Nafies Luthfi <nafiesL@gmail.com>
- */
-class OptionServiceProvider extends ServiceProvider
-{
-    /**
-     * Bootstrap the application services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        //
-    }
-
-    /**
-     * Register the application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        $this->app->alias(Option::class, 'option');
-    }
-}
diff --git a/app/Services/Facades/Option.php b/app/Services/Facades/Option.php
deleted file mode 100644
index 0129dd9..0000000
--- a/app/Services/Facades/Option.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Services\Facades;
-
-use Illuminate\Support\Facades\Facade;
-
-/**
- * Option facade class.
- *
- * @author Nafies Luthfi <nafiesL@gmail.com>
- */
-class Option extends Facade
-{
-    protected static function getFacadeAccessor()
-    {
-        return 'option';
-    }
-}
diff --git a/config/app.php b/config/app.php
index 5b8dee2..3772937 100644
--- a/config/app.php
+++ b/config/app.php
@@ -172,7 +172,6 @@ return [
         App\Providers\AppServiceProvider::class,
         App\Providers\AuthServiceProvider::class,
         App\Providers\EventServiceProvider::class,
-        App\Providers\OptionServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
 
         Laracasts\Flash\FlashServiceProvider::class,
@@ -225,7 +224,6 @@ return [
         'View'         => Illuminate\Support\Facades\View::class,
 
         'Carbon'    => Carbon\Carbon::class,
-        'Option'    => App\Services\Facades\Option::class,
         'Terbilang' => Riskihajar\Terbilang\Facades\Terbilang::class,
 
         // Reference Facades
@@ -233,6 +231,7 @@ return [
         'SubscriptionType' => App\Entities\Subscriptions\Type::class,
         'ProjectStatus'    => App\Entities\Projects\Status::class,
         'AdminDashboard'   => Facades\App\Queries\AdminDashboardQuery::class,
+        'Option'           => Facades\App\Services\Option::class,
     ],
 
 ];