Deleted some unused functions