ENH: Remove redundant methods + more elegant way to poll for samples