[Default skin] More code cleanup