Cleaned up some cruft.