Cleaned up AppModel