Add in attack effect
Remove some unused codes