clean up per renggli, check bechmarks.