Remove Old junk that was confusing folks