oops: remove things that depend on spy.raw