diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index bd04ea69067a..75665b4aa97c 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -144,9 +144,6 @@ class CompanySettings extends BaseSettings
 	public $email_template_reminder1 = '';
 	public $email_template_reminder2 = '';
 	public $email_template_reminder3 = '';
-	public $has_custom_design1 = false;
-	public $has_custom_design2 = false;
-	public $has_custom_design3 = false;
 	public $enable_portal_password = false;
 	public $show_accept_invoice_terms = false;
 	public $show_accept_quote_terms = false;
@@ -183,9 +180,6 @@ class CompanySettings extends BaseSettings
 		'country_id' => 'string',
 		'vat_number' => 'string',
 		'id_number' => 'string',
-		'has_custom_design1' => 'bool',
-		'has_custom_design2' => 'bool',
-		'has_custom_design3' => 'bool',
 		'tax_name1' => 'string',
 		'tax_name2' => 'string',
 		'tax_name3' => 'string',
@@ -296,8 +290,6 @@ class CompanySettings extends BaseSettings
 		$data->datetime_format_id = (string)config('ninja.i18n.datetime_format_id');
 		$data->military_time = (bool )config('ninja.i18n.military_time');
 		$data->date_format_id = (string)config('ninja.i18n.date_format_id');
-		$data->start_of_week = (int) config('ninja.i18n.start_of_week');
-		$data->financial_year_start = (int)config('ninja.i18n.financial_year_start');
 		$data->country_id = (string)config('ninja.i18n.country_id');
 		$data->translations = (object) [];
 		
diff --git a/app/Http/Controllers/OpenAPI/Schema.php b/app/Http/Controllers/OpenAPI/CompanySchema.php
similarity index 100%
rename from app/Http/Controllers/OpenAPI/Schema.php
rename to app/Http/Controllers/OpenAPI/CompanySchema.php
diff --git a/app/Http/Controllers/OpenAPI/CompanyUserSchema.php b/app/Http/Controllers/OpenAPI/CompanyUserSchema.php
index 55bb18958a54..b6fe8048b174 100644
--- a/app/Http/Controllers/OpenAPI/CompanyUserSchema.php
+++ b/app/Http/Controllers/OpenAPI/CompanyUserSchema.php
@@ -9,29 +9,16 @@
  *       @OA\Property(property="is_owner", type="boolean", example=true, description="Determines whether the user owns this company"),
  *       @OA\Property(property="is_locked", type="boolean", example=true, description="Determines whether the users access to this company has been locked"),
  *       @OA\Property(property="updated_at", type="int", example="1231232312321", description="The last time the record was modified"),
- *       @OA\Property(property="deleted_at", type="int", example="1231232312321", description="Timestamp when the user was archived"),
- *     )
+ *       @OA\Property(property="deleted_at", type="int", example="12312312321", description="Timestamp when the user was archived"),
+ *     ),
+ *     @OA\Schema(ref="#/components/schema/Company"),
+ *     @OA\Schema(ref="#/components/schema/User"),
+ *     @OA\Schema(ref="#/components/schema/Account"),
+ *     @OA\Schema(ref="#/components/schema/CompanyToken"),
  *   }
  * )
  */
 
-
-        :
-          type: 
-          properties:
-            per_page:
-              type: integer
-              example: 25
-              description: 'Used for the default number of items to be displayed in list views'
-
-
-
-
-        company:
-          $ref: '#/components/schemas/Company'
-        user:
-          $ref: '#/components/schemas/User'
-        account:
-          $ref: '#/components/schemas/Account'
-        company_token:
-          $ref: '#/components/schemas/CompanyToken'
+/**
+ * 
+ */
\ No newline at end of file
diff --git a/app/Http/Controllers/OpenAPI/Headers.php b/app/Http/Controllers/OpenAPI/Headers.php
new file mode 100644
index 000000000000..f436c5d99979
--- /dev/null
+++ b/app/Http/Controllers/OpenAPI/Headers.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @OA\Header(
+ *     header="X-API-TOKEN",
+ *     description="The API version",
+ *     @OA\Schema( type="number" )
+ * ),
+ * 
+ * @OA\Header(
+ *     header="X-RateLimit-Remaining",
+ *     description="The number of requests left for the time window.",
+ *     @OA\Schema( type="integer" )
+ * ),
+ * 
+ * @OA\Header(
+ *     header="X-RateLimit-Limit",
+ *     description="The total number of requests in a given time window.",
+ *     @OA\Schema( type="integer" )
+ * ),
+ */
\ No newline at end of file
diff --git a/app/Http/Controllers/OpenAPI/Parameters.php b/app/Http/Controllers/OpenAPI/Parameters.php
index dadeec7266b6..40f0634ae42f 100644
--- a/app/Http/Controllers/OpenAPI/Parameters.php
+++ b/app/Http/Controllers/OpenAPI/Parameters.php
@@ -84,23 +84,6 @@
  *         )
  *     ),
  * 
- * @OA\Header(
- *     header="X-API-TOKEN",
- *     description="The API version",
- *     @OA\Schema( type="number" )
- * ),
- * 
- * @OA\Header(
- *     header="X-RateLimit-Remaining",
- *     description="The number of requests left for the time window.",
- *     @OA\Schema( type="integer" )
- * ),
- * 
- * @OA\Header(
- *     header="X-RateLimit-Limit",
- *     description="The total number of requests in a given time window.",
- *     @OA\Schema( type="integer" )
- * ),
  */
 
 
diff --git a/app/Http/Requests/Client/StoreClientRequest.php b/app/Http/Requests/Client/StoreClientRequest.php
index 01d1aaf4e577..bbfc67842fd3 100644
--- a/app/Http/Requests/Client/StoreClientRequest.php
+++ b/app/Http/Requests/Client/StoreClientRequest.php
@@ -46,7 +46,7 @@ class StoreClientRequest extends Request
 
             for ($i = 0; $i < count($contacts); $i++) {
                 //$rules['contacts.' . $i . '.email'] = 'required|email|unique:client_contacts,email,' . isset($contacts[$i]['id']);
-                $rules['contacts.' . $i . '.email'] = 'email';
+                $rules['contacts.' . $i . '.email'] = 'nullable|email';
             }
 
         }