remove commented code
remove usage of suppressLoadCountIncrease
fix unit tests