popup removal and unlinking added