Drop PCL7 support as it wasn't working correctly