Remove deprecated, extraneous code