minor cleanup 30914