cleanup for rev2