NOJIRA Clean up legacey skins