Delete unused code
Change file name