(Per #20) Updating documentation for removal, removing more code