more dumb file duplicate fixes