Migrated Project to gradle and did some cleanup