Clean up, removed original POC