Shortened Quests - Clean ups