Change the to remove prefix