Removed/rewrote models and tests