Remove extraneous crud