Clean up after #349