Fix pfcmd help and remove rebase stuff