Some cleanups on skins