remove dead code
[WIP]
[WIP]