removed old headers, clean-up, change copyDefault default option to
true.