Converting to PCL and removing tests.