PCL integrated and setups cleaned up