Removed unused items to simplify for POC