#125 #398 cleanup