Removed some unused code
More test compilation fixes