#106 cleanup