cleanup to more nearly what the PoC should have looked like