Remove from 7 files
Remove from spell.c