Scripted/ShadeOfAkama: Some cleanups