POC Code Clean up