Remove dead code

Fix and update Excel layout info

Better category tree generation

Renaming for better code consistency