Clean up the code, add datadir statements, no distractor probe