Remove prototype code; should make it actually usable in a wider scope