Updating to remove unecessary code, doc fixes