#36 cleanup