Rip out now unused spell code, tidy