Clean up for 2.1 in master

Review by @cvogt