fix pb reference and remove unused file post rebase
unbreak the migrate folder