Adjustment of codes.
Remove some unused files.