Cleaned up a bunch of cruft