Fix nflowcache aggregation (see #515) and cleanup some code

Fix nflowcache aggregation (see #515) and cleanup some code #287