Deleting functions that are no longer used
Updating convetions