d734e28221
Remove redundant model classes. Follow code style guidelines for imports. Fixes bug 1200723 Change-Id: I2949065bb1d053805032e0a429f77e93dfc61a55