deleted unused file and minor name changes