#141 cleanup