POIs cleanup, stats fixes