Removed confusing "working copy" stuff etc.