Removed access to deprecated functions