Remove hitch function.
Remove unused aliases.