Checkpoint: Cleaned up a lot withint the WP management infrastructure
Checkpoint WPs issue-free in operation