Cleanup up wp feature removal