#102 cleanup