fix some syntax issues, remove unused settings