Proguard cleanup