Add some left out code and remove some null code

This was what I had to do after all the new wallpaper commits I made