removed old-style models and related DAOs/tests