Removing final drill handling from algorithm code