I think all of these edit views can go (can be in a separate PR though).