Revert "-c and -i become work well by source filter"

This reverts commit 3b10d655553a4638ef1800795ee98651eb0639b2.
cleanup array and factor