Remove some commented code, still need to fix evolution card logic