Remove hardcoded settings