Remove three surplus files and renamed and corrected one other