Some correction and remove unnecessary value