Fix ambiguity with timedPop, cleanup of unused function