Removed extra vars and delete unused file