cleanup, add proguard