#125 cleanup