Merge "Remove some unused files from skins/common/"