Clean up in release. There was a conflict.