Refactor/clean/fix save/delete -- especially with joins