Clean-up poc code --- see poc branch