Remove prefix test
Simplify method

[skip ci]