taoshan: update and cleanup