removed a bunch of obsolete models
big style changes