Remove unused class
Fix overly enthusiastic ProGuard obfuscation