Fix ambiguity with timedPop, cleanup of unused function
Merge pull request #31 from tribal-tec/master

Fix ambiguity with timedPop, cleanup of unused function