More cleanup

cc: @thatch45 and @s0undt3ch Please review carefully, especially the change to the flo daemon.
This check will bypass the block grace time check if report for is in the output, so it should still be here