Removed some cruft.
Cleaned up some things.