fix base style issue
remove unused files
Merge commit '5f46f56f51835c57a5da8f42bd6bf6df229554b1'