Removed a couple of extra functions.