Removed deprecated functionality and includes because of pcl usage