SPEED-6 Fix: remove unused method
Fix: tabulation