Revert "update pop methods"

This reverts commit 0ffb24b42af3c907c00dcf00125930e4562a3409.
Revert "Revert "update pop methods""

This reverts commit b8015f553381f929bf803b8f32a9b3dee4ef2e0b.