Remove some redundant files; Update some minor stuff