Remove redundant take no time checks. Closes #1