Removed a few older functions that are already replaced by newer versions