v0.22 Delete extraneous code