[cleanup] removing unused members and imports, changed groovy def's to
actual types