NOW: Firework cleanup

NOW: Firework cleanup