Removed unused classes and methods from popover implementation.