Remove more old proguard stuff