Code clean up
Prefix option removed