Remove old untested code