diff --git a/Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithBallTree.asset b/Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithBallTree.asset
index 88b9bcf4..ffdda44d 100644
--- a/Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithBallTree.asset
+++ b/Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithBallTree.asset
@@ -16,5 +16,5 @@ MonoBehaviour:
   displayName: Interact With Ball tree
   description: Whack the tree with a cucumba.
   icon: {fileID: 0}
-  unlocks:
-  - {fileID: 11400000, guid: 6386246caab8faa40b2da221d9ab9b8a, type: 2}
+  unlocks: []
+  showIndicator: 0
diff --git a/Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithFootballBird.asset b/Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithFootballBird.asset
deleted file mode 100644
index 6239c56f..00000000
--- a/Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithFootballBird.asset
+++ /dev/null
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 84e39aac66cf4a10a89abc01b04b13af, type: 3}
-  m_Name: InteractWithFootballBird
-  m_EditorClassIdentifier: 
-  stepId: InteractFootballBird
-  displayName: Interact Football Bird
-  description: Take a picture of the Football bird
-  icon: {fileID: 0}
-  unlocks: []
diff --git a/Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithFootballBird.asset.meta b/Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithFootballBird.asset.meta
deleted file mode 100644
index aed7df47..00000000
--- a/Assets/Data/Puzzles/FootballBirdPuzzle/InteractWithFootballBird.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0df54e69020c39e44b3b486cd6ac475a
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Data/Puzzles/FootballBirdPuzzle/PlaceFootballInLureSpotA.asset b/Assets/Data/Puzzles/FootballBirdPuzzle/PlaceFootballInLureSpotA.asset
index 227eedcc..cd69323b 100644
--- a/Assets/Data/Puzzles/FootballBirdPuzzle/PlaceFootballInLureSpotA.asset
+++ b/Assets/Data/Puzzles/FootballBirdPuzzle/PlaceFootballInLureSpotA.asset
@@ -16,5 +16,5 @@ MonoBehaviour:
   displayName: Football in luring spot A
   description: Place the Football into luring spot A
   icon: {fileID: 0}
-  unlocks:
-  - {fileID: 11400000, guid: 0df54e69020c39e44b3b486cd6ac475a, type: 2}
+  unlocks: []
+  showIndicator: 0
diff --git a/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWLawnMower.asset b/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWLawnMower.asset
index 7147ee3c..fe58854c 100644
--- a/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWLawnMower.asset
+++ b/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWLawnMower.asset
@@ -16,6 +16,5 @@ MonoBehaviour:
   displayName: Start Lawnmower
   description: Start up the lawnmower so the Gardener runs after it.
   icon: {fileID: 0}
-  unlocks:
-  - {fileID: 11400000, guid: f9da68caaae2a244885a13cf2e2e45c0, type: 2}
+  unlocks: []
   showIndicator: 1
diff --git a/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWithHammerBird.asset b/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWithHammerBird.asset
deleted file mode 100644
index 5cf5a442..00000000
--- a/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWithHammerBird.asset
+++ /dev/null
@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 84e39aac66cf4a10a89abc01b04b13af, type: 3}
-  m_Name: InteractWithHammerBird
-  m_EditorClassIdentifier: 
-  stepId: InteractHammerBird
-  displayName: Interact With HammerBird
-  description: TAke  picture of the HammerBird
-  icon: {fileID: 0}
-  unlocks: []
diff --git a/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWithHammerBird.asset.meta b/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWithHammerBird.asset.meta
deleted file mode 100644
index 653918fb..00000000
--- a/Assets/Data/Puzzles/HammerBirdPuzzle/InteractWithHammerBird.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 829fc7c8046e0844f93bf810dc1f0ebd
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Data/Puzzles/HammerBirdPuzzle/PickUpNails.asset b/Assets/Data/Puzzles/HammerBirdPuzzle/PickUpNails.asset
index 54a3d619..3d11902c 100644
--- a/Assets/Data/Puzzles/HammerBirdPuzzle/PickUpNails.asset
+++ b/Assets/Data/Puzzles/HammerBirdPuzzle/PickUpNails.asset
@@ -17,6 +17,5 @@ MonoBehaviour:
   description: Pick up some nails from the back of the van once the gaardener is
     gone.
   icon: {fileID: 0}
-  unlocks:
-  - {fileID: 11400000, guid: 28848561ff31fe24ea9f8590dee0bf8f, type: 2}
+  unlocks: []
   showIndicator: 0
diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity
index 6a59fd40..bccabff6 100644
--- a/Assets/Scenes/Levels/Quarry.unity
+++ b/Assets/Scenes/Levels/Quarry.unity
@@ -466564,6 +466564,7 @@ PrefabInstance:
       objectReference: {fileID: 260961018}
     m_RemovedComponents:
     - {fileID: 5015123355472106337, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+    - {fileID: 2013850788445308701, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects:
     - targetCorrespondingSourceObject: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
@@ -468008,7 +468009,8 @@ PrefabInstance:
       propertyPath: characterToInteract
       value: 2
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 2944268128369172028, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: