Remove unnecessary configuration and change updete some