Updated spec for GRADLE-2017
Removed unused methods