Remove unused code
Add the autojump setting
Update files