cleanup of remaining v1 code