Deleting some unused functions