Merge pull request #564 from luke-jr/optimize_remove_CheckWork_delay