Removed already unused code for popup