Removed extra cruft.