removed unrequired files
changed machine and user identifier template
removed deprecated code and model definition