Updated build.gradle and removed unused code