Core/Scripts: Skadi code arrangements, removed unnecessary code.