VBID-1881 Clean up pop post change