Remove un-needed "default prefix" code