Clean up merge from master