#19 cleanup