commit popover and remove compile time deps