Clean up

See #4107