Fixing more stuff. Deleting morew vestigal stuff.