finishing cleaning up models with only necessary variables

Fixes #6