Removing unused ninja graph
Popovers refactor.