massive speedup for fanout and bump of version
cleanup done