Revert "New System, new Wallpaper"

This reverts commit 6db95f4534c3f0b39dff171a6295f3bb19ce2cd7.
Disable/clean-up some un-needed stuff

Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>