#93 cleanup