Controller cleanup, updated model seeder and rebase tools