Last cleanup for SAMI instrument drivers