Cleanup defaults. Closes #3778