Remove old "lancelot" code