Removed all WP references
Removed all WP references