Rebase Settings and remove inused functions