remove now-redundant stuff!