Fix for Issue#91, remove same optional classes not compatible with android
Add test for Issue #90