Cleaned up files and models