Fix multiple patterns issue
uncommit some scripts, prepare for script cleanup