Cleaned up cruft.