Even more cleanup ; code we never actually used