more cleanups due to #616