Removed some models and tests that aren't used any more. Also, some work on shares