Removed/renamed deprecated models; Specs finally run