Delete unused files and create/test new model files