remove redundant files and fix some issues