Campbility fix for new WP and P2

Bug fix, files simplify.