#37 cleanup