[ScriptRunner] cleanup and remove the need for separate skin.