removed artefacts of the old API