Remove old, dead and untested code

@sisidra @DavW