Fix trade-bugs patch, get rid of artifact-nervous-immediate