taoshan: misc. fix & cleanup