clean-up unused imports
update wills version