some changes
remove tmp