checge style, remove files
merge