Remove unneeded aliases, modify pull & rebase