Buffs and debuffs now correctly removed based on duration