Removing / deprecating functions that should never be used.