Light grid-related cleanup#1898

slipher wants to merge 7 commits intoDaemonEngine:masterDaemonEngine/Daemon:masterfrom

slipher:grid-cleanupslipher/Daemon:grid-cleanupCopy head branch name to clipboard