Finished removing Shell from Popups