Remove unused file and update function name