removed some unnecessary settings