Removed some cruft, reorganized some things.