Finalv1

Because nothing is ever completely final.  Just got rid of a useless
function.