removed old D/K stuff