Cleanup some really old code...