make solution compilable again and cleanup references