Further improvement to remove trailing .