cleanup for the commits from haohaolee.