Work in feedback by Joey Hess, other clarifications
Get rid of legacy procedure