Remove old code

Hopefully this fixes the build as well