More changes to remove wallpaper code.