Remove superfluous models and tables
fix tests
Merge remote branch 'origin/master'