More cleanup

cc: @thatch45 and @s0undt3ch Please review carefully, especially the change to the flo daemon.
This will break salt raet, since we need to handle the None the case