First edit, removing the stuff we don't want, ready for the new stuff.