Cleaned up old models and deps

Cleaned up old models and deps