Instrument cleanups