Clean up more unused code. Comment out tests which fail due to the refacter