Removed unneeded procedures