Cleaning up after last merge