Remove unused shortcuts and tidy-up a little