More cleanup, moved background functions to universal system.