BMS-47 : Code cleanup, remove unused, remove sysout