removed unnecessary settings,