#86 cleanup