Update some files to 4.3_r2.1
Remove some unused files