Remove prefix optimization