Remove this cruft