Clean up. To prepare migration to oAuth 2.0