Delete deprecated and old stuff

* Finally getting rid of some trash - phew, what a relief.