Cleanup some more resources

mainly based on Android Studio code inspection