Fix popovers, clean up unused files