Removed some unnecessary vars in models

corrected requirements, too