Removed scheme tweaks