Fix correctly and remove useless config.