Removed bogus imports, added proguard flags