Deleted unused files/duplicated functions