quick-edit/my-edit: Get rid of some unused stuff and rearrange