Fully remove rebase

@kevgo a continuation on #46