Cleaned the rest on models