Remove Unused Code, Fixed Startup Errors (Now Remove spell_swap