Clean up goofs from rebase