diff --git a/src/Action/ActionController.ts b/src/Action/ActionController.ts
index bcefabe..8ca1d22 100644
--- a/src/Action/ActionController.ts
+++ b/src/Action/ActionController.ts
@@ -43,12 +43,4 @@ export class ActionController {
             throw new TryLaterError(aroundMinutes(1), 'Not same village');
         }
     }
-
-    ensureBuildingQueueIsEmpty() {
-        const storage = new VillageStorage(grabActiveVillageId());
-        const info = storage.getBuildingQueueInfo();
-        if (info.seconds > 0) {
-            throw new TryLaterError(info.seconds + 1, 'Building queue is full');
-        }
-    }
 }
diff --git a/src/Action/BuildBuildingAction.ts b/src/Action/BuildBuildingAction.ts
index b9fb8d9..c8f13ea 100644
--- a/src/Action/BuildBuildingAction.ts
+++ b/src/Action/BuildBuildingAction.ts
@@ -10,7 +10,6 @@ export class BuildBuildingAction extends ActionController {
     async run(args: Args, task: Task): Promise<any> {
         try {
             this.ensureSameVillage(args, task);
-            this.ensureBuildingQueueIsEmpty();
             const buildTypeId = args.buildTypeId || taskError('Undefined build type id');
             clickBuildButton(buildTypeId);
         } catch (e) {
diff --git a/src/Action/UpgradeBuildingAction.ts b/src/Action/UpgradeBuildingAction.ts
index 905fd6f..b16a94d 100644
--- a/src/Action/UpgradeBuildingAction.ts
+++ b/src/Action/UpgradeBuildingAction.ts
@@ -10,7 +10,6 @@ export class UpgradeBuildingAction extends ActionController {
     async run(args: Args, task: Task): Promise<any> {
         try {
             this.ensureSameVillage(args, task);
-            this.ensureBuildingQueueIsEmpty();
             clickUpgradeButton();
         } catch (e) {
             if (e instanceof GrabError) {
diff --git a/src/Grabber/VillageOverviewPageGrabber.ts b/src/Grabber/VillageOverviewPageGrabber.ts
index cce3509..92b3dc8 100644
--- a/src/Grabber/VillageOverviewPageGrabber.ts
+++ b/src/Grabber/VillageOverviewPageGrabber.ts
@@ -13,7 +13,6 @@ export class VillageOverviewPageGrabber extends Grabber {
         }
 
         this.storage.storeResourcesPerformance(grabResourcesPerformance());
-        this.storage.storeBuildingQueueInfo(this.grabBuildingQueueInfoOrDefault());
 
         const buildingQueueInfo = this.grabBuildingQueueInfoOrDefault();
         const buildingEndTime = buildingQueueInfo.seconds
diff --git a/src/Storage/VillageStorage.ts b/src/Storage/VillageStorage.ts
index a3ab352..f92a40a 100644
--- a/src/Storage/VillageStorage.ts
+++ b/src/Storage/VillageStorage.ts
@@ -1,17 +1,15 @@
 import { DataStorage } from '../DataStorage';
-import { BuildingQueueInfo } from '../Game';
 import { Resources, ResourcesInterface } from '../Core/Resources';
 import { ResourceStorage } from '../Core/ResourceStorage';
 import { IncomingMerchant, MerchantsInfo } from '../Core/Market';
 import { VillageSettings, VillageSettingsDefaults } from '../Core/Village';
 import { ProductionQueue } from '../Core/ProductionQueue';
 import { getNumber } from '../utils';
-import { Task, TaskList, uniqTaskId } from '../Queue/TaskProvider';
+import { Task, uniqTaskId } from '../Queue/TaskProvider';
 
 const RESOURCES_KEY = 'resources';
 const CAPACITY_KEY = 'capacity';
 const PERFORMANCE_KEY = 'performance';
-const BUILDING_QUEUE_INFO_KEY = 'building_queue_info';
 const INCOMING_MERCHANTS_KEY = 'incoming_merchants';
 const MERCHANTS_INFO_KEY = 'merchants_info';
 const SETTINGS_KEY = 'settings';
@@ -54,16 +52,6 @@ export class VillageStorage {
         return this.storage.getTyped(PERFORMANCE_KEY, ResourceOptions);
     }
 
-    storeBuildingQueueInfo(info: BuildingQueueInfo): void {
-        this.storage.set(BUILDING_QUEUE_INFO_KEY, info);
-    }
-
-    getBuildingQueueInfo(): BuildingQueueInfo {
-        let plain = this.storage.get(BUILDING_QUEUE_INFO_KEY);
-        let res = new BuildingQueueInfo(0);
-        return Object.assign(res, plain) as BuildingQueueInfo;
-    }
-
     storeMerchantsInfo(info: MerchantsInfo): void {
         this.storage.set(MERCHANTS_INFO_KEY, info);
     }
diff --git a/src/VillageState.ts b/src/VillageState.ts
index f1b9f15..4745855 100644
--- a/src/VillageState.ts
+++ b/src/VillageState.ts
@@ -78,7 +78,6 @@ interface VillageOwnState {
      */
     totalRequired: ResourceLineState;
     incomingResources: Resources;
-    buildRemainingSeconds: number;
     settings: VillageSettings;
     queues: { [queue: string]: VillageProductionQueueState | undefined };
 }
@@ -196,7 +195,6 @@ function createVillageOwnState(
     const resources = storage.getResources();
     const resourceStorage = storage.getResourceStorage();
     const performance = storage.getResourcesPerformance();
-    const buildQueueInfo = storage.getBuildingQueueInfo();
     const requiredResources = taskCollection.getReadyTaskRequiredResources();
     const frontierResources = taskCollection.getFrontierResources();
     const totalRequiredResources = taskCollection.getAllTasksRequiredResources();
@@ -210,7 +208,6 @@ function createVillageOwnState(
         required: calcResourceBalance(requiredResources, resources, performance),
         frontierRequired: calcResourceBalance(frontierResources, resources, performance),
         totalRequired: calcResourceBalance(totalRequiredResources, resources, performance),
-        buildRemainingSeconds: buildQueueInfo.seconds,
         incomingResources: calcIncomingResources(storage),
         settings: storage.getSettings(),
         queues: createAllProductionQueueStates(storage, taskCollection),