Updated for prefix removal