Removed superflous code that doesn't really belong in this library.