diff --git a/src/modules/5s/BoardGamePerformance.vue b/src/modules/5s/BoardGamePerformance.vue
index 0c72ef3..45a14d0 100644
--- a/src/modules/5s/BoardGamePerformance.vue
+++ b/src/modules/5s/BoardGamePerformance.vue
@@ -3,7 +3,6 @@ import { Chart as ChartJS, registerables } from 'chart.js'
 import { useBoardGameStore } from '@/modules/5s/board-game-store'
 import { toDuration, toSeconds } from '@/modules/5s/utils'
 import { getNatural } from '@/utils'
-import { _ } from '@faker-js/faker/dist/airline-D6ksJFwG'
 import { computed, ref } from 'vue'
 import { Bar } from 'vue-chartjs'
 
diff --git a/src/modules/pull-system/feature/FeatureSteps.vue b/src/modules/pull-system/feature/FeatureSteps.vue
index a6c2d7f..506eb6b 100644
--- a/src/modules/pull-system/feature/FeatureSteps.vue
+++ b/src/modules/pull-system/feature/FeatureSteps.vue
@@ -10,7 +10,7 @@ defineProps<{ alias: string }>()
 
 const featureStore = useFeatureStore()
 
-onMounted(() => featureStore.initBoard('mobile-app', NUMBER_OF_FEATURES))
+onMounted(() => featureStore.initBoard(NUMBER_OF_FEATURES))
 </script>
 
 <template>
diff --git a/src/modules/pull-system/feature/FlowControls.vue b/src/modules/pull-system/feature/FlowControls.vue
index 1fc5c46..dfaa9e1 100644
--- a/src/modules/pull-system/feature/FlowControls.vue
+++ b/src/modules/pull-system/feature/FlowControls.vue
@@ -13,7 +13,7 @@ const featureStore = useFeatureStore()
 
 const confirmReset = () => {
   if (confirm('Are you sure you want to reset the board?')) {
-    featureStore.initBoard('mobile-app', NUMBER_OF_FEATURES)
+    featureStore.initBoard(NUMBER_OF_FEATURES)
   }
 }
 </script>
diff --git a/src/modules/pull-system/feature/feature-board.ts b/src/modules/pull-system/feature/feature-board.ts
index c24ca9f..e51bfb4 100644
--- a/src/modules/pull-system/feature/feature-board.ts
+++ b/src/modules/pull-system/feature/feature-board.ts
@@ -72,6 +72,7 @@ const mayBeInProgress = ({
 
 export const newBacklog = (limit?: number) => {
   const initialFeatures = [...mobileAppFeatures]
+
   return limit !== undefined
     ? popNElement(shuffleArray(initialFeatures), limit)
     : shuffleArray(initialFeatures)
@@ -249,8 +250,8 @@ export const nextDay = (
   strategy: Strategy | 'problem-solving'
 ): FeatureState => {
   state.meta.totalDays++
-  // // each day, the teams know how to better work together
-  // state.meta.teamWorkExperience += 0.1
+  // each day, the teams know how to better work together
+  // state.meta.teamWorkExperience += 0.1 // Removed with a simplified version of pull system without the problem-solving strategy
 
   if (strategy === 'problem-solving') {
     const hasTeamLearned = randomFloat(0, 1) > 0.25
@@ -301,7 +302,7 @@ export const simulate = (
 ): FeatureState => {
   let i = 0
 
-  while (!isProjectFinished(state.features) && i++ < HARD_STOP) {
+  while (i++ < HARD_STOP && !isProjectFinished(state.features)) {
     if (strategy.includes('dps')) {
       if (state.meta.totalDays % 5 === 0) {
         state = nextDay(state, 'problem-solving')
diff --git a/src/modules/pull-system/feature/feature-store.ts b/src/modules/pull-system/feature/feature-store.ts
index da02529..af35270 100644
--- a/src/modules/pull-system/feature/feature-store.ts
+++ b/src/modules/pull-system/feature/feature-store.ts
@@ -37,6 +37,7 @@ export const useFeatureStore = defineStore('feature', {
     async initBoard(limit?: number) {
       this.backlog = newBacklog(limit)
       this.steps = featureSteps
+
       const initialSteps = featureSteps.filter(
         (step) => step.title !== 'Release' && step.title !== 'Development'
       )