remove more deprecated stuff
add workaround for #129 and see if that "solves" the issue