Checkstyle
Tweak code formatter
Checkstyle
PLAT-3544 - Remove unused code