HIVE-4343 - cleanup before patch submission