removed old scheme code