Cleanup before migrating to Android Studio