Moved some code back into prepareForDeletion with WPAccount

Jetpack accounts need the cleanup as well