diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/goaltracker.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/goaltracker.lua
index afbefa5dab..0bd8262480 100644
--- a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/goaltracker.lua	
+++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/goaltracker.lua	
@@ -317,7 +317,7 @@ local function makescoregoal(i)
 				InitCommand=cmd(x,325;halign,0;zoomto,4,4;diffuse,byJudgment('TapNoteScore_Miss');diffusealpha,1),
 				MouseLeftClickMessageCommand=function(self)
 					if isOver(self) and update and sg then
-						profile:RemoveGoalsByKey(ck)
+						sg:Delete()
 						MESSAGEMAN:Broadcast("UpdateGoals")
 					end
 				end,
diff --git a/src/Profile.cpp b/src/Profile.cpp
index af316598a8..e26147bf8e 100644
--- a/src/Profile.cpp
+++ b/src/Profile.cpp
@@ -2471,7 +2471,15 @@ void Profile::SetAnyAchievedGoals(RString ck, float rate, const HighScore& pscor
 		if (tmp.percent < pscore.GetWifeScore() * 100.f) {	// should probably adhere to the established process of storing scores percents as 0.xx to avoid this kind of confusion -mina
 			tmp.achieved = true;
 			tmp.timeachieved = pscore.GetDateTime();
-		}		
+		}
+	}
+}
+
+void Profile::DeleteGoal(RString ck, DateTime assigned) {
+	auto& sgv = goalmap.at(ck);
+	for (size_t i = 0; i < sgv.size(); ++i) {
+		if (sgv[i].timeassigned == assigned)
+			sgv.erase(sgv.begin() + i);
 	}
 }
 
@@ -3744,21 +3752,6 @@ class LunaProfile : public Luna<Profile>
 		return 1;
 	}
 	
-	// make unshit -mina
-	static int RemoveGoalsByKey(T* p, lua_State *L) {
-		RString ck = SArg(1);
-		auto it = p->goalmap.find(ck);
-		if (it == p->goalmap.end()) {
-			lua_pushnil(L);
-		}
-		else {
-			p->goalmap.erase(ck);
-			SONGMAN->SetHasGoal(p->goalmap);
-		}
-
-		return 1;
-	}
-
 	static int GetAllGoals(T* p, lua_State *L) {
 		lua_newtable(L);
 		int idx = 0;
@@ -3864,7 +3857,6 @@ class LunaProfile : public Luna<Profile>
 		ADD_METHOD( GetPBWifeScoreByKey );
 		ADD_METHOD( ValidateAllScores );
 		ADD_METHOD( GetGoalByKey );
-		ADD_METHOD( RemoveGoalsByKey );
 		ADD_METHOD( GetAllGoals );
 	}
 };
@@ -3920,6 +3912,11 @@ class LunaScoreGoal : public Luna<ScoreGoal>
 
 	static int SetComment(T* p, lua_State *L) { p->comment = SArg(1); return 1; }
 
+	static int Delete(T* p, lua_State *L) {
+		PROFILEMAN->GetProfile(PLAYER_1)->DeleteGoal(p->chartkey, p->timeassigned);
+		return 1;
+	}
+
 	LunaScoreGoal()
 	{
 		ADD_METHOD( GetRate );
@@ -3934,6 +3931,7 @@ class LunaScoreGoal : public Luna<ScoreGoal>
 		ADD_METHOD( SetPercent );
 		ADD_METHOD( SetPriority );
 		ADD_METHOD( SetComment );
+		ADD_METHOD( Delete );
 	}
 };
 LUA_REGISTER_CLASS(ScoreGoal)
diff --git a/src/Profile.h b/src/Profile.h
index 0e451ce4a3..ba56bb598a 100644
--- a/src/Profile.h
+++ b/src/Profile.h
@@ -278,6 +278,7 @@ class Profile
 
 	// more future goalman stuff -mina
 	void CreateGoal(RString ck);
+	void DeleteGoal(RString ck, DateTime assigned);
 	map<RString, vector<ScoreGoal>> goalmap;
 	bool ChartkeyHasGoal(RString ck);
 	ScoreGoal& GetLowestGoalForRate(RString ck, float rate);