Remove unnecessary references

and switch to prepare draft 03