[Default skin] Next step in the cleaning up. Many more to follow.