Cleaned up models and config