Clean up dead code

[gharbat]

I think we have a lot of dead code, let's clean it!

[Sahil Bhardwaj]

I am looking into this @gharbat @codebanesr