migrate to new kotlin version
cleanup